aboutsummaryrefslogtreecommitdiff
path: root/manifests/mysql.pp
diff options
context:
space:
mode:
authorAntoine Beaupre <anarcat@koumbit.org>2009-09-24 12:16:03 -0400
committerAntoine Beaupre <anarcat@koumbit.org>2009-09-24 12:16:03 -0400
commit343f27fa91865c0c20f633f36048f8d61179fb02 (patch)
treeecc6f2e8aa1616d04d4cc6e550ff35fec9b34f44 /manifests/mysql.pp
parentde010623a8594900b9661db9c0dc8707a1e402fe (diff)
parent70cae2f75b1938ac26a75597a8e75dc3e7d327b7 (diff)
downloadpuppet-backupninja-343f27fa91865c0c20f633f36048f8d61179fb02.tar.gz
puppet-backupninja-343f27fa91865c0c20f633f36048f8d61179fb02.tar.bz2
Merge commit 'micah/master'
Conflicts: manifests/mysql.pp manifests/rdiff.pp manifests/server.pp
Diffstat (limited to 'manifests/mysql.pp')
-rw-r--r--manifests/mysql.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 6241519..83d8f8f 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -26,13 +26,13 @@ define backupninja::mysql(
default => $configfile,
}
- include backupninja::client
- file { "${backupninja::client::configdir}/${order}_${name}.mysql":
+ include backupninja::client::defaults
+ file { "${backupninja::client::defaults::configdir}/${order}_${name}.mysql":
ensure => $ensure,
content => template('backupninja/mysql.conf.erb'),
owner => root,
group => root,
mode => 0600,
- require => File["${backupninja::client::configdir}"]
+ require => File["${backupninja::client::defaults::configdir}"]
}
}