use the client classes for dependencies instead of directly defining packages

diff --git a/manifests/maildir.pp b/manifests/maildir.pp
index 1427af1b6ea0948e6f7b38111cc0ab2955e59887..ab7ff559b4c4a3d119176c46c6630cec3d7f3c8a 100644 (file)
--- 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 c9363be80641658720576f170fcdfacbed1f9eaf..2624ecd8d1a3d43338af7f78ee6a81c3dd5ef5ff 100644 (file)
--- 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 }
 }