From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 13 Dec 2009 02:25:42 +0000 (-0200)
Subject: Merge branch 'master' of ssh://gitosis@git.sarava.org:2203/puppet-backup
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a933f2c5ef5f77b081f1e11b1057c7bdc1b34fc8;p=puppet-backup.git

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

Conflicts:
	manifests/init.pp
---

a933f2c5ef5f77b081f1e11b1057c7bdc1b34fc8
diff --cc manifests/init.pp
index ef079b0,164c0de..74691c6
--- a/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",