mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
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
This commit is contained in:
parent
afbd61811f
commit
842da858b6
5 changed files with 26 additions and 21 deletions
2
debian/additions/mariadb.cnf
vendored
2
debian/additions/mariadb.cnf
vendored
|
@ -12,6 +12,8 @@
|
||||||
# One can use all long options that the program supports.
|
# One can use all long options that the program supports.
|
||||||
# Run program with --help to get a list of available options and with
|
# Run program with --help to get a list of available options and with
|
||||||
# --print-defaults to see which it would actually understand and use.
|
# --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
|
# This group is read both by the client and the server
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
|
|
||||||
[client]
|
[client]
|
||||||
# Example of client certificate usage
|
# Example of client certificate usage
|
||||||
# ssl-cert=/etc/mysql/client-cert.pem
|
# ssl-cert = /etc/mysql/client-cert.pem
|
||||||
# ssl-key=/etc/mysql/client-key.pem
|
# ssl-key = /etc/mysql/client-key.pem
|
||||||
#
|
#
|
||||||
# Allow only TLS encrypted connections
|
# 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
|
# 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
|
# /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL
|
||||||
|
|
|
@ -9,12 +9,12 @@
|
||||||
# with the following contents:
|
# with the following contents:
|
||||||
#
|
#
|
||||||
# [Service]
|
# [Service]
|
||||||
# User=mysql
|
# User = mysql
|
||||||
# StandardOutput=syslog
|
# StandardOutput = syslog
|
||||||
# StandardError=syslog
|
# StandardError = syslog
|
||||||
# SyslogFacility=daemon
|
# SyslogFacility = daemon
|
||||||
# SyslogLevel=err
|
# SyslogLevel = err
|
||||||
# SyslogIdentifier=mysqld
|
# SyslogIdentifier = mysqld
|
||||||
#
|
#
|
||||||
# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/
|
# 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
|
# It has been reported that passwords should be enclosed with ticks/quotes
|
||||||
# especially if they contain "#" chars...
|
# especially if they contain "#" chars...
|
||||||
|
|
||||||
nice = 0
|
nice = 0
|
||||||
skip_log_error
|
skip_log_error
|
||||||
syslog
|
syslog
|
||||||
|
|
19
debian/additions/mariadb.conf.d/60-galera.cnf
vendored
19
debian/additions/mariadb.conf.d/60-galera.cnf
vendored
|
@ -2,19 +2,20 @@
|
||||||
# * Galera-related settings
|
# * Galera-related settings
|
||||||
#
|
#
|
||||||
# See the examples of server wsrep.cnf files in /usr/share/mysql
|
# See the examples of server wsrep.cnf files in /usr/share/mysql
|
||||||
|
# and read more at https://mariadb.com/kb/en/galera-cluster/
|
||||||
|
|
||||||
[galera]
|
[galera]
|
||||||
# Mandatory settings
|
# Mandatory settings
|
||||||
#wsrep_on=ON
|
#wsrep_on = ON
|
||||||
#wsrep_provider=
|
#wsrep_provider =
|
||||||
#wsrep_cluster_address=
|
#wsrep_cluster_address =
|
||||||
#binlog_format=row
|
#binlog_format = row
|
||||||
#default_storage_engine=InnoDB
|
#default_storage_engine = InnoDB
|
||||||
#innodb_autoinc_lock_mode=2
|
#innodb_autoinc_lock_mode = 2
|
||||||
|
|
||||||
# Allow server to accept connections on all interfaces.
|
# Allow server to accept connections on all interfaces.
|
||||||
#bind-address=0.0.0.0
|
#bind-address = 0.0.0.0
|
||||||
|
|
||||||
# Optional settings
|
# Optional settings
|
||||||
#wsrep_slave_threads=1
|
#wsrep_slave_threads = 1
|
||||||
#innodb_flush_log_at_trx_commit=0
|
#innodb_flush_log_at_trx_commit = 0
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
[mariadb]
|
[mariadb]
|
||||||
#
|
#
|
||||||
# uncomment the following line to enable SPIDER storage engine
|
# Uncomment line to enable
|
||||||
#
|
#
|
||||||
#plugin-load-add=ha_spider.so
|
#plugin-load-add = ha_spider
|
||||||
|
|
||||||
|
# Read more at https://mariadb.com/kb/en/spider/
|
||||||
|
|
Loading…
Add table
Reference in a new issue