From 245e6bde0c4c4a24f6b169aa88aaf0ff038241ac Mon Sep 17 00:00:00 2001
From: Antoine Beaupre <anarcat@koumbit.org>
Date: Mon, 27 Apr 2009 15:22:11 -0400
Subject: always use force, use backports for rdiff-backup in etch so we always
 use lenny's version

---
 manifests/rdiff.pp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'manifests')

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 }
 }
   
-- 
cgit v1.2.3