diff options
| author | Antoine Beaupre <anarcat@koumbit.org> | 2009-09-24 12:16:03 -0400 |
|---|---|---|
| committer | Antoine Beaupre <anarcat@koumbit.org> | 2009-09-24 12:16:03 -0400 |
| commit | 343f27fa91865c0c20f633f36048f8d61179fb02 (patch) | |
| tree | ecc6f2e8aa1616d04d4cc6e550ff35fec9b34f44 /manifests/maildir.pp | |
| parent | de010623a8594900b9661db9c0dc8707a1e402fe (diff) | |
| parent | 70cae2f75b1938ac26a75597a8e75dc3e7d327b7 (diff) | |
| download | puppet-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/maildir.pp')
| -rw-r--r-- | manifests/maildir.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/maildir.pp b/manifests/maildir.pp index 624e5d1..1427af1 100644 --- a/manifests/maildir.pp +++ b/manifests/maildir.pp @@ -22,7 +22,7 @@ define backupninja::maildir( $remove = false, $multiconnection = yes, $keepdaily='4', $keepweekly='2', $keepmonthly='2') { - include backupninja::client + include backupninja::client::defaults case $srcdir { false: { err("need to define a source directory to backup!") } } case $destdir { false: { err("need to define a destination directory to backup!") } } @@ -30,13 +30,13 @@ define backupninja::maildir( case $destuser { false: { err("need to define a destination user for backups!") } } case $destid_file { false: { err("need to define a ssh key id file to use!") } } - file { "${backupninja::client::configdir}/${order}_${name}.maildir": + file { "${backupninja::client::defaults::configdir}/${order}_${name}.maildir": ensure => $ensure, content => template('backupninja/maildir.conf.erb'), owner => root, group => root, mode => 0600, - require => File["${backupninja::client::configdir}"] + require => File["${backupninja::client::defaults::configdir}"] } package { rsync: ensure => installed } } |