diff options
| author | Otto Kekäläinen <otto@debian.org> | 2020-10-06 22:39:32 +0300 |
|---|---|---|
| committer | Otto Kekäläinen <otto@kekalainen.net> | 2021-01-03 21:14:32 +0200 |
| commit | 16876e47d8c5bc690df66b69c1ae26bf35f24f78 (patch) | |
| tree | 2fd70864f923e89f5940eccee4696d969f695aef /debian/additions | |
| parent | 1bf9acceef252000618a137853638c612339024b (diff) | |
| download | mariadb-git-16876e47d8c5bc690df66b69c1ae26bf35f24f78.tar.gz | |
Deb: Unify config file syntax style
- no space after comment
- align equal signs in groups
Upstreamed from: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/a8c67e15c9a58199f085ae84cdb97c542667767d
Diffstat (limited to 'debian/additions')
| -rw-r--r-- | debian/additions/mariadb.conf.d/50-client.cnf | 6 | ||||
| -rw-r--r-- | debian/additions/mariadb.conf.d/50-server.cnf | 1 | ||||
| -rw-r--r-- | debian/additions/mariadb.conf.d/60-galera.cnf | 10 |
3 files changed, 9 insertions, 8 deletions
diff --git a/debian/additions/mariadb.conf.d/50-client.cnf b/debian/additions/mariadb.conf.d/50-client.cnf index 54cfb44ac2d..1fd4685df22 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-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf index 6f2768cc538..9efaf865d75 100644 --- a/debian/additions/mariadb.conf.d/50-server.cnf +++ b/debian/additions/mariadb.conf.d/50-server.cnf @@ -82,6 +82,7 @@ expire_logs_days = 10 #ssl-ca = /etc/mysql/cacert.pem #ssl-cert = /etc/mysql/server-cert.pem #ssl-key = /etc/mysql/server-key.pem +#require-secure-transport = on # # * Character sets diff --git a/debian/additions/mariadb.conf.d/60-galera.cnf b/debian/additions/mariadb.conf.d/60-galera.cnf index 55d7c0b0322..274891b1313 100644 --- a/debian/additions/mariadb.conf.d/60-galera.cnf +++ b/debian/additions/mariadb.conf.d/60-galera.cnf @@ -6,11 +6,11 @@ [galera] # Mandatory settings -#wsrep_on = ON -#wsrep_provider = -#wsrep_cluster_address = -#binlog_format = row -#default_storage_engine = InnoDB +#wsrep_on = ON +#wsrep_cluster_name = "MariaDB Galera Cluster" +#wsrep_cluster_address = gcomm:// +#binlog_format = row +#default_storage_engine = InnoDB #innodb_autoinc_lock_mode = 2 # Allow server to accept connections on all interfaces. |