From 07c2de901f0fcdc5e1179d84e25c814fbd4d8ce5 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 7 Dec 2009 17:11:14 -0500
Subject: remove no longer referenced call to rdiff-installed class, and add a
 check for rsync package installation to avoid duplicate package definitions

---
 manifests/server.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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