More backupninja updates

diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index 7183492d59d15c3d80b483fa6b6e3356d6dda917..8660bcc27d20af23b7c28f403b10574f10e2649a 100644 (file)
--- a/manifests/duplicity.pp
+++ b/manifests/duplicity.pp
@@ -17,7 +17,7 @@ define backup::duplicity(
   $exclude_unencrypted = $backup::params::exclude_unencrypted
   $include_unencrypted = $backup::params::include_unencrypted
 
-  include backupninja::client
+  include backupninja
 
   # backup dest folder
   file { "${backup::params::backupdir}/duplicity":
@@ -27,18 +27,18 @@ define backup::duplicity(
   }
 
   # the backupninja rule for this duplicity backup
-  file { "${backupninja::client::defaults::configdir}/${order}_duplicity-${title}.sh":
+  file { "${backupninja::configdir}/${order}_duplicity-${title}.sh":
     ensure  => $ensure,
     content => template('backup/duplicity.conf.erb'),
     owner   => root,
     group   => root,
     mode    => 0600,
-    require => File["${backupninja::client::defaults::configdir}"],
+    require => File["${backupninja::configdir}"],
   }
 
   # check duplicity backups once a week
   cron { "duplicity_check-$title.$domain":
-    command  => "/bin/bash ${backupninja::client::defaults::configdir}/${order}_duplicity-${title}.sh --check",
+    command  => "/bin/bash ${backupninja::configdir}/${order}_duplicity-${title}.sh --check",
     user     => root,
     hour     => "0",
     minute   => "0",