From: Micah Anderson <micah@riseup.net>
Date: Mon, 7 Dec 2009 22:11:14 +0000 (-0500)
Subject: remove no longer referenced call to rdiff-installed class, and add a check for rsync... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=07c2de901f0fcdc5e1179d84e25c814fbd4d8ce5;p=puppet-backupninja.git

remove no longer referenced call to rdiff-installed class, and add a check for rsync package installation to avoid duplicate package definitions
---

diff --git a/manifests/server.pp b/manifests/server.pp
index efc30ab..54a283a 100644
--- 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