summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-07-01 18:29:30 +0000
committermh <mh@immerda.ch>2008-07-01 18:29:30 +0000
commit25fbef80605b0ac7d29daf07d98f145f3f9936a6 (patch)
treeeef9a6cffbebf9e1a8d564bb878a4e4498402ece /manifests/init.pp
parentc731c6e89d7fa31529af44fc3aaef2ebd9e3e72e (diff)
merged with puzzle
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp21
1 files changed, 13 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 47f580f..81feee0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,13 +22,18 @@ class mysql::server {
default: { include mysql::server::base }
}
- if $selinux {
- include mysql::selinux
+ # avoid problem with bootstrapping
+ case $mysql_exists {
+ 'true': {
+ if $selinux {
+ include mysql::selinux
+ }
+
+ if $use_munin {
+ include mysql::munin
+ }
+ }
}
-
- if $use_munin {
- include mysql::munin
- }
}
class mysql::server::base {
@@ -41,7 +46,7 @@ class mysql::server::base {
source => [
"puppet://$server/files/mysql/${fqdn}/my.cnf",
"puppet://$server/files/mysql/my.cnf",
- "puppet://$server/mysql/config/${operatingsystem}/my.cnf",
+ "puppet://$server/mysql/config/my.cnf.${operatingsystem}",
"puppet://$server/mysql/config/my.cnf"
],
ensure => file,
@@ -73,7 +78,7 @@ class mysql::server::base {
}
file{'/etc/cron.d/mysql_backup.cron':
- source => [ "puppet://$server/mysql/backup/${operatingsystem}/mysql_backup.cron",
+ source => [ "puppet://$server/mysql/backup/mysql_backup.cron.${operatingsystem}",
"puppet://$server/mysql/backup/mysql_backup.cron" ],
require => [ Exec[set_mysql_rootpw], File['/root/.my.cnf'] ],
owner => root, group => 0, mode => 0600;