summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2020-06-27 15:43:46 +0300
committerDaniel Black <daniel@mariadb.org>2020-08-01 10:31:41 +1000
commit842da858b6c5b619bb5395ef4216f7e675b0f3a0 (patch)
treea525cbb711b31a7cb8848ce3ba5687c8ac400e7a /debian
parentafbd61811faad1b95e941e9b8f0c174f412200d4 (diff)
downloadmariadb-git-842da858b6c5b619bb5395ef4216f7e675b0f3a0.tar.gz
Unify config syntax in default files
- Include a link to the relevant KB article for more info - Use spaced around the equal sign for better readability and so that the examples are more aligned with the general style in the KB - Load plugins with just the base name, the .so is optional and excess
Diffstat (limited to 'debian')
-rw-r--r--debian/additions/mariadb.cnf2
-rw-r--r--debian/additions/mariadb.conf.d/50-client.cnf6
-rw-r--r--debian/additions/mariadb.conf.d/50-mysqld_safe.cnf14
-rw-r--r--debian/additions/mariadb.conf.d/60-galera.cnf19
4 files changed, 22 insertions, 19 deletions
diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf
index d40cdfe33d7..62b4ea8f11e 100644
--- a/debian/additions/mariadb.cnf
+++ b/debian/additions/mariadb.cnf
@@ -12,6 +12,8 @@
# One can use all long options that the program supports.
# Run program with --help to get a list of available options and with
# --print-defaults to see which it would actually understand and use.
+#
+# If you are new to MariaDB, check out https://mariadb.com/kb/en/basic-mariadb-articles/
#
# This group is read both by the client and the server
diff --git a/debian/additions/mariadb.conf.d/50-client.cnf b/debian/additions/mariadb.conf.d/50-client.cnf
index fe8f2f3b788..54cfb44ac2d 100644
--- a/debian/additions/mariadb.conf.d/50-client.cnf
+++ b/debian/additions/mariadb.conf.d/50-client.cnf
@@ -5,11 +5,11 @@
[client]
# Example of client certificate usage
-# ssl-cert=/etc/mysql/client-cert.pem
-# ssl-key=/etc/mysql/client-key.pem
+# ssl-cert = /etc/mysql/client-cert.pem
+# ssl-key = /etc/mysql/client-key.pem
#
# Allow only TLS encrypted connections
-# ssl-verify-server-cert=on
+# 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
diff --git a/debian/additions/mariadb.conf.d/50-mysqld_safe.cnf b/debian/additions/mariadb.conf.d/50-mysqld_safe.cnf
index df8e82f5b3c..e24f96a9e65 100644
--- a/debian/additions/mariadb.conf.d/50-mysqld_safe.cnf
+++ b/debian/additions/mariadb.conf.d/50-mysqld_safe.cnf
@@ -9,12 +9,12 @@
# with the following contents:
#
# [Service]
-# User=mysql
-# StandardOutput=syslog
-# StandardError=syslog
-# SyslogFacility=daemon
-# SyslogLevel=err
-# SyslogIdentifier=mysqld
+# User = mysql
+# StandardOutput = syslog
+# StandardError = syslog
+# SyslogFacility = daemon
+# SyslogLevel = err
+# SyslogIdentifier = mysqld
#
# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/
@@ -23,6 +23,6 @@
# It has been reported that passwords should be enclosed with ticks/quotes
# especially if they contain "#" chars...
-nice = 0
+nice = 0
skip_log_error
syslog
diff --git a/debian/additions/mariadb.conf.d/60-galera.cnf b/debian/additions/mariadb.conf.d/60-galera.cnf
index 945c05281c9..55d7c0b0322 100644
--- a/debian/additions/mariadb.conf.d/60-galera.cnf
+++ b/debian/additions/mariadb.conf.d/60-galera.cnf
@@ -2,19 +2,20 @@
# * Galera-related settings
#
# See the examples of server wsrep.cnf files in /usr/share/mysql
+# and read more at https://mariadb.com/kb/en/galera-cluster/
[galera]
# Mandatory settings
-#wsrep_on=ON
-#wsrep_provider=
-#wsrep_cluster_address=
-#binlog_format=row
-#default_storage_engine=InnoDB
-#innodb_autoinc_lock_mode=2
+#wsrep_on = ON
+#wsrep_provider =
+#wsrep_cluster_address =
+#binlog_format = row
+#default_storage_engine = InnoDB
+#innodb_autoinc_lock_mode = 2
# Allow server to accept connections on all interfaces.
-#bind-address=0.0.0.0
+#bind-address = 0.0.0.0
# Optional settings
-#wsrep_slave_threads=1
-#innodb_flush_log_at_trx_commit=0
+#wsrep_slave_threads = 1
+#innodb_flush_log_at_trx_commit = 0