summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-12-05 20:14:04 +0100
committermh <mh@immerda.ch>2013-12-05 20:14:04 +0100
commitc38546e15fe62e964c63b03222cc3c2824ee5c36 (patch)
tree6a38310c5719e1ec09dcc197329e601b2aa60a1c
parent6d485b169360f5d113537f14e2dbbd83e56b2f9c (diff)
introduce the /etc/mysql/conf.d/ directory for CentOS
-rw-r--r--files/config/my.cnf.CentOS1
-rw-r--r--manifests/server/centos.pp17
2 files changed, 18 insertions, 0 deletions
diff --git a/files/config/my.cnf.CentOS b/files/config/my.cnf.CentOS
index 58090f7..1abf15c 100644
--- a/files/config/my.cnf.CentOS
+++ b/files/config/my.cnf.CentOS
@@ -84,3 +84,4 @@ quick
max_allowed_packet = 16M
default-character-set=utf8
+!includedir /etc/mysql/conf.d/
diff --git a/manifests/server/centos.pp b/manifests/server/centos.pp
index a55a57f..50678cf 100644
--- a/manifests/server/centos.pp
+++ b/manifests/server/centos.pp
@@ -6,4 +6,21 @@ class mysql::server::centos inherits mysql::server::clientpackage {
File['mysql_main_cnf']{
path => '/etc/my.cnf',
}
+
+ file{
+ '/etc/mysql':
+ ensure => directory,
+ owner => root,
+ group => 0,
+ mode => '0644';
+ '/etc/mysql/conf.d':
+ ensure => directory,
+ recurse => true,
+ purge => true,
+ force => true,
+ owner => root,
+ group => 0,
+ mode => '0644',
+ notify => Service['mysql'];
+ }
}