aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Beaupre <anarcat@koumbit.org>2009-04-27 15:22:11 -0400
committerAntoine Beaupre <anarcat@koumbit.org>2009-04-27 15:22:11 -0400
commit245e6bde0c4c4a24f6b169aa88aaf0ff038241ac (patch)
tree7b3bdfe8fad478fafb38d054ee52d4bdef1bba0a
parentbc2b6bd0e4222a6477ae806a5329480a3ecf873b (diff)
downloadpuppet-backupninja-245e6bde0c4c4a24f6b169aa88aaf0ff038241ac.tar.gz
puppet-backupninja-245e6bde0c4c4a24f6b169aa88aaf0ff038241ac.tar.bz2
always use force, use backports for rdiff-backup in etch so we always use lenny's version
-rw-r--r--manifests/rdiff.pp12
1 files changed, 10 insertions, 2 deletions
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 9c81289..e3e429b 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -23,7 +23,7 @@ define backupninja::rdiff(
"/home/*/gtk-gnutella-downloads" ],
$include = [ "/var/spool/cron/crontabs", "/var/backups", "/etc", "/root",
"/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
- $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
+ $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true,
$ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false,
$backuptag = false)
{
@@ -61,6 +61,14 @@ define backupninja::rdiff(
mode => 0600,
require => File["${backupninja::client::configdir}"]
}
- package { "rdiff-backup": ensure => installed }
+ 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 }
}