Merge branch 'master' of git://labs.riseup.net/module_backupninja

Conflicts:
	manifests/dup.pp

2 files changed, 11 insertions, 2 deletions

diff --git a/manifests/client.pp b/manifests/client.pp
index 8368eb4..c3d186d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -109,3 +109,14 @@ class backupninja::client::rdiff_backup inherits backupninja::client {
     }
   }
 }
+
+class backupninja::client::duplicity inherits backupninja::client {
+
+  if !defined(Package["duplicity"]) {
+    if $duplicity_ensure_version == '' { $duplicity_ensure_version = 'installed' }
+    package { 'duplicity':
+      ensure => $duplicity_ensure_version,
+    }
+  }
+}
+  
diff --git a/manifests/dup.pp b/manifests/dup.pp
index f12fc0f..9b554dc 100644
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -84,8 +84,6 @@ define backupninja::duplicity( $order  = 90,
                                $backuptag            = false,
                                # key options
                                $installkey           = true ) {
-  # needed packages
-  package { "duplicity": ensure => installed }
 
   # the client with configs for this machine
   include backupninja::client