add backups servicegroup, put rdiff in a seperate class so we can override

diff --git a/manifests/server.pp b/manifests/server.pp
index 3978f3ab38ae93a7eb0ed79b65ec1e555628a842..77fc33d5c9a95f5a8cee2862aac904705178971f 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -41,7 +41,8 @@ class backupninja::server {
   File <<| tag == "backupninja-$real_backupserver_tag" |>>
   Ssh_authorized_key <<| tag == "backupninja-$real_backupserver_tag" |>>
 
-  package { [ "rsync", "rdiff-backup" ]: ensure => installed }
+  package { "rsync": ensure => installed }
+  include backupninja::rdiff-installed
 
   # this define allows nodes to declare a remote backup sandbox, that have to
   # get created on the server
@@ -82,7 +83,7 @@ class backupninja::server {
     }
       
     # configure a passive service check for backups
-    nagios2::passive_service { "backups-$real_host": nagios2_host_name => $real_host, nagios2_description => 'backups' }
+    nagios2::passive_service { "backups-$real_host": nagios2_host_name => $real_host, nagios2_description => 'backups', servicegroups => "backups" }
 
     @@file { "$real_dir":
       ensure => directory,