diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-13 00:25:42 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-13 00:25:42 -0200 |
| commit | a933f2c5ef5f77b081f1e11b1057c7bdc1b34fc8 (patch) | |
| tree | f53701b1f1e3b198153e6c13fcede656e9540dc4 | |
| parent | 4e494cf0eff237ad8638c20d8438ee83d1a0bab8 (diff) | |
| parent | 39525031704db81bfd0cd3732d7437643236ddf8 (diff) | |
| download | puppet-backup-a933f2c5ef5f77b081f1e11b1057c7bdc1b34fc8.tar.gz puppet-backup-a933f2c5ef5f77b081f1e11b1057c7bdc1b34fc8.tar.bz2 | |
Merge branch 'master' of ssh://gitosis@git.sarava.org:2203/puppet-backup
Conflicts:
manifests/init.pp
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | templates/dup.conf.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index ef079b0..74691c6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -97,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 => "/bin/bash ${backupninja::client::defaults::configdir}/${order}_duplicity-${title}.sh --check", user => root, hour => "0", minute => "0", diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb index d35e0e2..9070bac 100644 --- a/templates/dup.conf.erb +++ b/templates/dup.conf.erb @@ -26,7 +26,7 @@ mkdir -p $TMP export PASSPHRASE="<%= password %>" # adds support for checking the existing backup -if [ "$1" == "--check"]; then +if [ "$1" == "--check" ]; then duplicity collection-status file:///$BACKUP_FOLDER else # it's important to let $EXCLUDE come before $INCLUDE to |