From 02c8f3342ec9de4a822e68f3f494f7c108bff574 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 10 Jan 2015 02:18:15 +0100
Subject: introduce new mariadb based config for EL7

---
 files/config/my.cnf.CentOS | 45 ++++++++++++---------------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

(limited to 'files/config/my.cnf.CentOS')

diff --git a/files/config/my.cnf.CentOS b/files/config/my.cnf.CentOS
index 1abf15c..c15d2b8 100644
--- a/files/config/my.cnf.CentOS
+++ b/files/config/my.cnf.CentOS
@@ -3,19 +3,16 @@ datadir=/var/lib/mysql/data
 log-bin=/var/lib/mysql/mysql-bin
 expire_logs_days=5
 socket=/var/lib/mysql/mysql.sock
-# Default to using old password format for compatibility with mysql 3.x
-# clients (those using the mysqlclient10 compatibility package).
-old_passwords=0
-
-character-set-server        = utf8
-skip-name-resolve
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+# Settings user and group are ignored when systemd is used.
+# If you need to run mysqld under a different user or group,
+# customize your systemd unit file for mariadb according to the
+# instructions in http://fedoraproject.org/wiki/Systemd
 
 bind-address=127.0.0.1
 max_allowed_packet = 10M
 
-# Disabling symbolic-links is recommended to prevent assorted security risks
-symbolic-links=0
-
 # Query cache is used to cache SELECT results and later return them
 # without actual executing the same query once again. Having the query
 # cache enabled may result in significant speed improvements, if your
@@ -59,29 +56,11 @@ innodb_file_per_table
 
 query_cache_limit=5M
 
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-default-character-set=utf8
-
-[mysqlimport]
-default-character-set=utf8
-
-[mysqlshow]
-default-character-set=utf8
-
-[mysql.server]
-user=mysql
-basedir=/usr
-
 [mysqld_safe]
-log-error=/var/log/mysqld.log
-pid-file=/var/run/mysqld/mysqld.pid
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-default-character-set=utf8
+log-error=/var/log/mariadb/mariadb.log
+pid-file=/var/run/mariadb/mariadb.pid
 
-!includedir /etc/mysql/conf.d/
+#
+# include all files from the config directory
+#
+!includedir /etc/my.cnf.d
-- 
cgit v1.2.3