remove no longer referenced call to rdiff-installed class, and add a check for rsync...

diff --git a/manifests/server.pp b/manifests/server.pp
index efc30abefa108194b90de495f75351f4e3ae8cc4..54a283a75f7c5d21998af50e485e7eb63e3c20df 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -43,8 +43,12 @@ class backupninja::server {
   File <<| tag == "backupninja-$real_backupserver_tag" |>>
   Ssh_authorized_key <<| tag == "backupninja-$real_backupserver_tag" |>>
 
-  package { "rsync": ensure => installed }
-  include backupninja::rdiff-installed
+  if !defined(Package["rsync"]) {
+    if $rsync_ensure_version == '' { $rsync_ensure_version = 'installed' }
+    package { 'rsync':
+      ensure => $rsync_ensure_version,
+    }
+  } 
 
   # this define allows nodes to declare a remote backup sandbox, that have to
   # get created on the server