Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use character set latin1 instead of utf #139

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions content/etc/icingaweb2/resources.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ dbname = "icingaweb2"
username = "icingaweb2"
password = "icingaweb2_changeme"
prefix = "icingaweb_"
charset = "utf8"
persistent = "0"

[icinga_ido]
Expand All @@ -18,7 +17,6 @@ port = "3306"
dbname = "icinga2idomysql"
username = "icinga2-ido-mysq"
password = "icinga2-ido-mysq_changeme"
charset = "utf8"
persistent = "0"

[director]
Expand All @@ -29,5 +27,4 @@ port = "3306"
dbname = "director"
username = "director"
password = "director_changeme"
charset = "utf8"
persistent = "0"
22 changes: 22 additions & 0 deletions content/etc/mysql/mariadb.conf.d/50-client.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# This group is read by the client library
# Use it for options that affect all clients, but not the server
#

[client]
# Default is Latin1, if you need UTF-8 set this (also in server section)
# default-character-set = utf8mb4

# Example of client certificate usage
# ssl-cert=/etc/mysql/client-cert.pem
# ssl-key=/etc/mysql/client-key.pem
#
# Allow only TLS encrypted connections
# ssl-verify-server-cert=on

# This group is *never* read by mysql client library, though this
# /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL
# client anyway.
# If you use the same .cnf file for MySQL and MariaDB,
# use it for MariaDB-only client options
[client-mariadb]
24 changes: 24 additions & 0 deletions content/etc/mysql/mariadb.conf.d/50-mysql-clients.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# These groups are read by MariaDB command-line tools
# Use it for options that affect only one utility
#

[mysql]
# Default is Latin1, if you need UTF-8 set this (also in server section)
#default-character-set = utf8mb4

[mysql_upgrade]

[mysqladmin]

[mysqlbinlog]

[mysqlcheck]

[mysqldump]

[mysqlimport]

[mysqlshow]

[mysqlslap]
30 changes: 30 additions & 0 deletions content/etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# NOTE: This file is read only by the traditional SysV init script, not systemd.
# MariaDB systemd does _not_ utilize mysqld_safe nor read this file.
#
# For similar behaviour, systemd users should create the following file:
# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
#
# To achieve the same result as the default 50-mysqld_safe.cnf, please create
# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
# with the following contents:
#
# [Service]
# User=mysql
# StandardOutput=syslog
# StandardError=syslog
# SyslogFacility=daemon
# SyslogLevel=err
# SyslogIdentifier=mysqld
#
# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/
#

[mysqld_safe]
# This will be passed to all mysql clients
# It has been reported that passwords should be enclosed with ticks/quotes
# especially if they contain "#" chars...
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
socket = /var/run/mysqld/mysqld.sock
nice = 0
skip_log_error
syslog
134 changes: 134 additions & 0 deletions content/etc/mysql/mariadb.conf.d/50-server.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
#
# These groups are read by MariaDB server.
# Use it for options that only the server (but not clients) should see
#
# See the examples of server my.cnf files in /usr/share/mysql/
#

# this is read by the standalone daemon and embedded servers
[server]

# this is only for the mysqld standalone daemon
[mysqld]

#
# * Basic Settings
#
user = mysql
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
port = 3306
basedir = /usr
datadir = /var/lib/mysql
tmpdir = /tmp
lc-messages-dir = /usr/share/mysql
skip-external-locking

# Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure.
bind-address = 127.0.0.1

#
# * Fine Tuning
#
key_buffer_size = 16M
max_allowed_packet = 16M
thread_stack = 192K
thread_cache_size = 8
# This replaces the startup script and checks MyISAM tables if needed
# the first time they are touched
myisam_recover_options = BACKUP
#max_connections = 100
#table_cache = 64
#thread_concurrency = 10

#
# * Query Cache Configuration
#
query_cache_limit = 1M
query_cache_size = 16M

#
# * Logging and Replication
#
# Both location gets rotated by the cronjob.
# Be aware that this log type is a performance killer.
# As of 5.1 you can enable the log at runtime!
#general_log_file = /var/log/mysql/mysql.log
#general_log = 1
#
# Error log - should be very few entries.
#
log_error = /var/log/mysql/error.log
#
# Enable the slow query log to see queries with especially long duration
#slow_query_log_file = /var/log/mysql/mariadb-slow.log
#long_query_time = 10
#log_slow_rate_limit = 1000
#log_slow_verbosity = query_plan
#log-queries-not-using-indexes
#
# The following can be used as easy to replay backup logs or for replication.
# note: if you are setting up a replication slave, see README.Debian about
# other settings you may need to change.
#server-id = 1
#log_bin = /var/log/mysql/mysql-bin.log
expire_logs_days = 10
max_binlog_size = 100M
#binlog_do_db = include_database_name
#binlog_ignore_db = exclude_database_name

#
# * InnoDB
#
# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
# Read the manual for more InnoDB related options. There are many!

#
# * Security Features
#
# Read the manual, too, if you want chroot!
# chroot = /var/lib/mysql/
#
# For generating SSL certificates you can use for example the GUI tool "tinyca".
#
# ssl-ca=/etc/mysql/cacert.pem
# ssl-cert=/etc/mysql/server-cert.pem
# ssl-key=/etc/mysql/server-key.pem
#
# Accept only connections using the latest and most secure TLS protocol version.
# ..when MariaDB is compiled with OpenSSL:
# ssl-cipher=TLSv1.2
# ..when MariaDB is compiled with YaSSL (default in Debian):
# ssl=on

#
# * Character sets
#
# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full
# utf8 4-byte character set. See also client.cnf
#
# character-set-server = utf8mb4
# collation-server = utf8mb4_general_ci

#
# * Unix socket authentication plugin is built-in since 10.0.22-6
#
# Needed so the root database user can authenticate without a password but
# only when running as the unix root user.
#
# Also available for other users if required.
# See https://mariadb.com/kb/en/unix_socket-authentication-plugin/

# this is only for embedded server
[embedded]

# This group is only read by MariaDB servers, not by MySQL.
# If you use the same .cnf file for MySQL and MariaDB,
# you can put MariaDB-only options here
[mariadb]

# This group is only read by MariaDB-10.1 servers.
# If you use the same .cnf file for MariaDB of different versions,
# use this group for options that older servers don't understand
[mariadb-10.1]
6 changes: 2 additions & 4 deletions content/opt/setup/60-icingaweb2
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,15 @@ icingacli module enable doc
# Create MySQL user on localhost or test given connection
if [ "${ICINGA2_IDO_MYSQL_HOST}" == "localhost" ]; then
mysql_root <<-END
CREATE DATABASE IF NOT EXISTS ${ICINGAWEB2_MYSQL_DATA}
CHARACTER SET 'utf8';
CREATE DATABASE IF NOT EXISTS ${ICINGAWEB2_MYSQL_DATA};
GRANT ALL
ON ${ICINGAWEB2_MYSQL_DATA}.*
TO '${ICINGAWEB2_MYSQL_USER}'@'localhost'
IDENTIFIED BY '${ICINGAWEB2_MYSQL_PASS}';
END
elif [ -n "${MYSQL_ROOT_PASSWORD}" ]; then
mysql_root <<-END
CREATE DATABASE IF NOT EXISTS ${ICINGAWEB2_MYSQL_DATA}
CHARACTER SET 'utf8';
CREATE DATABASE IF NOT EXISTS ${ICINGAWEB2_MYSQL_DATA};
GRANT ALL
ON ${ICINGAWEB2_MYSQL_DATA}.*
TO '${ICINGAWEB2_MYSQL_USER}'@'%'
Expand Down
6 changes: 2 additions & 4 deletions content/opt/setup/61-icingaweb2-director
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,15 @@ if evaluate_boolean "${ICINGA2_FEATURE_DIRECTOR}"; then
# Create MySQL user on localhost or test given connection
if [ "${ICINGAWEB2_DIRECTOR_MYSQL_HOST}" == "localhost" ]; then
mysql_root <<-END
CREATE DATABASE IF NOT EXISTS ${ICINGAWEB2_DIRECTOR_MYSQL_DATA}
CHARACTER SET 'utf8';
CREATE DATABASE IF NOT EXISTS ${ICINGAWEB2_DIRECTOR_MYSQL_DATA};
GRANT ALL
ON ${ICINGAWEB2_DIRECTOR_MYSQL_DATA}.*
TO '${ICINGAWEB2_DIRECTOR_MYSQL_USER}'@'localhost'
IDENTIFIED BY '${ICINGAWEB2_DIRECTOR_MYSQL_PASS}';
END
elif [ -n "${MYSQL_ROOT_PASSWORD}" ]; then
mysql_root <<-END
CREATE DATABASE IF NOT EXISTS ${ICINGAWEB2_DIRECTOR_MYSQL_DATA}
CHARACTER SET 'utf8';
CREATE DATABASE IF NOT EXISTS ${ICINGAWEB2_DIRECTOR_MYSQL_DATA};
GRANT ALL
ON ${ICINGAWEB2_DIRECTOR_MYSQL_DATA}.*
TO '${ICINGAWEB2_DIRECTOR_MYSQL_USER}'@'%'
Expand Down