Merge branch 'master' of git://labs.riseup.net/module_backupninja

Conflicts:
	manifests/rdiff.pp

4 files changed, 27 insertions, 12 deletions

diff --git a/README b/README
index 18192ad..5b7c2c9 100644
--- a/README
+++ b/README
@@ -47,15 +47,21 @@ You may also want to set some variables on your backup server, such as:
 Configure your backup clients
 -----------------------------
 
-Every handler that requires certain backup software to be installed,
-will handle the installation of that software, as long as you are not
-handling it elsewhere in your manifests. The handler will make sure
-that the correct version that is associated with puppet's 'installed'
-(or 'present') parameter is installed. If you need to specify a
-specific version of the programs that the class installs, you can
-specify the version you need installed by providing a variable, for
+The backupninja package and the necessary backup software will be
+installed automatically when you include any of the different handlers
+(as long as you are not handling it elsewhere in your manifests), for
 example:
 
+include backupninja::client::rdiff_backup
+
+In this case, the module will make sure that the backupninja package
+and the required rdiff-backup package are 'installed'/'present' (using
+puppet's ensure parameter language). If you need to specify a specific
+version of either backupninja itself, or the specific programs that
+the handler class installs, you can specify the version you need
+installed by providing a variable, for example:
+
+$backupninja_ensure_version = "0.9.7~bpo50+1"
 $rdiff_backup_ensure_version = "1.2.5-1~bpo40+1"
 $rsync_ensure_version = "3.0.6-1~bpo50+1"
 $duplicity_ensure_version = "0.6.04-1~bpo50+1"
diff --git a/manifests/client.pp b/manifests/client.pp
index 95e3905..287b02f 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -32,8 +32,11 @@ class backupninja::client::defaults {
     '' => true,
     default => $ssh_dir_manage
   }
-  package { 'backupninja':
-    ensure => '0.9.6-4';
+  if !defined(Package["backupninja"]) {
+    if $backupninja_ensure_version == '' { $backupninja_ensure_version = 'installed' }
+    package { 'backupninja':
+      ensure => $backupninja_ensure_version
+    }
   }
   file { $configdir:
     ensure => directory,
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 562d652..f750e23 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -26,7 +26,7 @@ define backupninja::rdiff(
   $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, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false,
-  $subfolder = 'rdiff-backup')
+  $nagios2_description = 'backups', $subfolder = 'rdiff-backup')
 {
   include backupninja::client::rdiff_backup
 
@@ -50,6 +50,7 @@ define backupninja::rdiff(
         manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir, key => $key,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
         backuptag => $real_backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore,
+        nagios2_description => $nagios2_description
       }
      
       backupninja::client::key
diff --git a/manifests/server.pp b/manifests/server.pp
index 7cd5dd1..a0bcbf2 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -62,7 +62,7 @@ class backupninja::server {
   define sandbox(
     $user = false, $host = false, $installuser = true, $dir = false, $manage_ssh_dir = true,
     $ssh_dir = false, $authorized_keys_file = false, $key = false, $keytype = 'dss', $backupkeys = false, $uid = false,
-    $gid = "backupninjas", $backuptag = false)
+    $gid = "backupninjas", $backuptag = false, $nagios2_description = "backups")
   {
     
     $real_user = $user ? {
@@ -95,9 +95,14 @@ class backupninja::server {
       default => $backuptag,
     }
 
+    $real_nagios2_description = $nagios2_description ? {
+      false => "backups",
+      default => $nagios2_description,
+    }
+
     if $nagios_server {
       # configure a passive service check for backups
-      nagios2::passive_service { "backups-$real_host": nagios2_host_name => $real_host, nagios2_description => 'backups', servicegroups => "backups" }
+      nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
     }
     
     if !defined(File["$real_dir"]) {