Merge branch 'master' of ssh://gitosis@git.sarava.org:2203/puppet-backup

Conflicts:
	manifests/init.pp

diff --cc manifests/init.pp
index ef079b0d2679e2d5b91677b08fe9e369d3593f09,164c0de1901c6b7e69948bf2262e6c9aee0c7a66..74691c6af1acade75fb8ff3d97e2e8023ec022e6
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -97,7 -96,7 +97,7 @@@ class backup 
  
      # check backups once a week
      cron { "duplicity_check--$title.$domain":
-       command  => "/bin/bash ${backupninja::client::defaults::configdir}/${order}_duplicity-${title}.sh --check"
 -      command  => "${backupninja::client::defaults::configdir}/${order}_duplicity-${title}.sh --check",
++      command  => "/bin/bash ${backupninja::client::defaults::configdir}/${order}_duplicity-${title}.sh --check",
        user     => root,
        hour     => "0",
        minute   => "0",