Skip to content

Commit 842da85

Browse files
ottokgrooverdan
authored andcommitted
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
1 parent afbd618 commit 842da85

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

debian/additions/mariadb.cnf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# One can use all long options that the program supports.
1313
# Run program with --help to get a list of available options and with
1414
# --print-defaults to see which it would actually understand and use.
15+
#
16+
# If you are new to MariaDB, check out https://mariadb.com/kb/en/basic-mariadb-articles/
1517

1618
#
1719
# This group is read both by the client and the server

debian/additions/mariadb.conf.d/50-client.cnf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
[client]
77
# Example of client certificate usage
8-
# ssl-cert=/etc/mysql/client-cert.pem
9-
# ssl-key=/etc/mysql/client-key.pem
8+
# ssl-cert = /etc/mysql/client-cert.pem
9+
# ssl-key = /etc/mysql/client-key.pem
1010
#
1111
# Allow only TLS encrypted connections
12-
# ssl-verify-server-cert=on
12+
# ssl-verify-server-cert = on
1313

1414
# This group is *never* read by mysql client library, though this
1515
# /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL

debian/additions/mariadb.conf.d/50-mysqld_safe.cnf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
# with the following contents:
1010
#
1111
# [Service]
12-
# User=mysql
13-
# StandardOutput=syslog
14-
# StandardError=syslog
15-
# SyslogFacility=daemon
16-
# SyslogLevel=err
17-
# SyslogIdentifier=mysqld
12+
# User = mysql
13+
# StandardOutput = syslog
14+
# StandardError = syslog
15+
# SyslogFacility = daemon
16+
# SyslogLevel = err
17+
# SyslogIdentifier = mysqld
1818
#
1919
# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/
2020

@@ -23,6 +23,6 @@
2323
# It has been reported that passwords should be enclosed with ticks/quotes
2424
# especially if they contain "#" chars...
2525

26-
nice = 0
26+
nice = 0
2727
skip_log_error
2828
syslog

debian/additions/mariadb.conf.d/60-galera.cnf

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
# * Galera-related settings
33
#
44
# See the examples of server wsrep.cnf files in /usr/share/mysql
5+
# and read more at https://mariadb.com/kb/en/galera-cluster/
56

67
[galera]
78
# Mandatory settings
8-
#wsrep_on=ON
9-
#wsrep_provider=
10-
#wsrep_cluster_address=
11-
#binlog_format=row
12-
#default_storage_engine=InnoDB
13-
#innodb_autoinc_lock_mode=2
9+
#wsrep_on = ON
10+
#wsrep_provider =
11+
#wsrep_cluster_address =
12+
#binlog_format = row
13+
#default_storage_engine = InnoDB
14+
#innodb_autoinc_lock_mode = 2
1415

1516
# Allow server to accept connections on all interfaces.
16-
#bind-address=0.0.0.0
17+
#bind-address = 0.0.0.0
1718

1819
# Optional settings
19-
#wsrep_slave_threads=1
20-
#innodb_flush_log_at_trx_commit=0
20+
#wsrep_slave_threads = 1
21+
#innodb_flush_log_at_trx_commit = 0

storage/spider/spider.cnf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[mariadb]
22
#
3-
# uncomment the following line to enable SPIDER storage engine
3+
# Uncomment line to enable
44
#
5-
#plugin-load-add=ha_spider.so
5+
#plugin-load-add = ha_spider
6+
7+
# Read more at https://mariadb.com/kb/en/spider/

0 commit comments

Comments
 (0)