aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-12-07 17:11:14 -0500
committerMicah Anderson <micah@riseup.net>2009-12-07 17:11:14 -0500
commit07c2de901f0fcdc5e1179d84e25c814fbd4d8ce5 (patch)
tree836686cbe6142b69e660794f5f7362b7e522b4eb /manifests
parent0a5a15cf049225d51aecb670f89fd9b1d32637b0 (diff)
downloadpuppet-backupninja-07c2de901f0fcdc5e1179d84e25c814fbd4d8ce5.tar.gz
puppet-backupninja-07c2de901f0fcdc5e1179d84e25c814fbd4d8ce5.tar.bz2
remove no longer referenced call to rdiff-installed class, and add a check for rsync package installation to avoid duplicate package definitions
Diffstat (limited to 'manifests')
-rw-r--r--manifests/server.pp8
1 files 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