summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/server/base.pp20
1 files changed, 16 insertions, 4 deletions
diff --git a/manifests/server/base.pp b/manifests/server/base.pp
index 322ae9a..ba90520 100644
--- a/manifests/server/base.pp
+++ b/manifests/server/base.pp
@@ -77,8 +77,20 @@ class mysql::server::base {
require => Package['mysql-server'],
}
- # Collect all databases and users
- Mysql_database<<| tag == "mysql_${::fqdn}" |>>
- Mysql_user<<| tag == "mysql_${::fqdn}" |>>
- Mysql_grant<<| tag == "mysql_${::fqdn}" |>>
+ file { '/etc/mysql/conf.d':
+ ensure => directory,
+ owner => 'root',
+ group => 0,
+ mode => '0755',
+ }
+
+ if str2bool($::mysql_exists) {
+ include mysql::server::account_security
+
+ # Collect all databases and users
+ Mysql_database<<| tag == "mysql_${::fqdn}" |>>
+ Mysql_user<<| tag == "mysql_${::fqdn}" |>>
+ Mysql_grant<<| tag == "mysql_${::fqdn}" |>>
+ }
+
}