diff options
| author | anarcat <anarcat@koumbit.org> | 2009-12-07 12:08:15 -0500 |
|---|---|---|
| committer | anarcat <anarcat@koumbit.org> | 2009-12-07 12:08:47 -0500 |
| commit | b380f1de1fe62d34f0788fedfb53c1354b0a31a3 (patch) | |
| tree | 658a3517e4b432f968aa17815ed64440633eaf9f | |
| parent | 222ebf64d1f0f54120c510ce408a946bb08ce791 (diff) | |
| download | puppet-backupninja-b380f1de1fe62d34f0788fedfb53c1354b0a31a3.tar.gz puppet-backupninja-b380f1de1fe62d34f0788fedfb53c1354b0a31a3.tar.bz2 | |
use the client classes for dependencies instead of directly defining packages
| -rw-r--r-- | manifests/maildir.pp | 3 | ||||
| -rw-r--r-- | manifests/rdiff.pp | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/manifests/maildir.pp b/manifests/maildir.pp index 1427af1..ab7ff55 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::defaults + include backupninja::client::maildir case $srcdir { false: { err("need to define a source directory to backup!") } } case $destdir { false: { err("need to define a destination directory to backup!") } } @@ -38,5 +38,4 @@ define backupninja::maildir( mode => 0600, require => File["${backupninja::client::defaults::configdir}"] } - package { rsync: ensure => installed } } diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp index c9363be..2624ecd 100644 --- a/manifests/rdiff.pp +++ b/manifests/rdiff.pp @@ -27,7 +27,7 @@ define backupninja::rdiff( $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false, $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false) { - include backupninja::client::defaults + include backupninja::client::rdiff-backup case $type { 'remote': { @@ -68,14 +68,5 @@ define backupninja::rdiff( mode => 0600, require => File["${backupninja::client::defaults::configdir}"] } - include backupninja::rdiff-installed -} - -class backupninja::rdiff-installed { - case $lsbdistcodename { - "etch": { $version = "1.2.5-1~bpo40+1" } - default: { $version = "installed" } - } - package { "rdiff-backup": ensure => $version } } |