diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-12-06 11:01:17 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-12-06 11:01:17 -0200 |
| commit | 55dfc08aaa67f87cbb5401f0e67a51dca1b413c4 (patch) | |
| tree | 8bccef3201591636eed4669233b9faf550fc97dd | |
| parent | 24b2ddc15afd304bee4431226c04050b81001e23 (diff) | |
| download | puppet-backup-55dfc08aaa67f87cbb5401f0e67a51dca1b413c4.tar.gz puppet-backup-55dfc08aaa67f87cbb5401f0e67a51dca1b413c4.tar.bz2 | |
Adding remove_all_but_n_full for dup action; excluding /root/.cache from backups
| -rw-r--r-- | manifests/init.pp | 3 | ||||
| -rw-r--r-- | templates/dup.conf.erb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 6bd8133..f925bd8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -26,7 +26,7 @@ $backupdir_remote = "$backupdir/remote" # for data that's going to be encrypted and signed $backup_include_unencrypted = [ "/etc", "/var", "/home", ] -$backup_exclude_unencrypted = [ "$backupdir_remote", "$backupdir/duplicity", "/var/cache", "/var/log", "/var/vservers", "/var/chroot" ] +$backup_exclude_unencrypted = [ "$backupdir_remote", "$backupdir/duplicity", "/var/cache", "/var/log", "/var/vservers", "/var/chroot", "/root/.cache" ] # for data that were previously encrypted and signed $backup_include_encrypted = [ "$backupdir/duplicity", ] @@ -190,6 +190,7 @@ class backup { $ensure = present, $full_if_older_than = "1M", $remove_older_than = "45D", + $remove_all_but_n_full = "1", $periodic_check = absent, $directory = "${backupdir}/duplicity") { diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb index ee58d2f..631bf9d 100644 --- a/templates/dup.conf.erb +++ b/templates/dup.conf.erb @@ -10,6 +10,7 @@ BACKUP_FOLDER="<%= directory %>" FULL_IF_OLDER_THAN="<%= full_if_older_than %>" REMOVE_OLDER_THAN="<%= remove_older_than %>" +REMOVE_ALL_BUT_N_FULL="<%= remove_all_but_n_full %>" ENCRYPT_KEY="<%= encryptkey %>" SIGN_KEY="<%= encryptkey %>" <% backup_exclude_unencrypted.each do |del| -%> @@ -41,6 +42,8 @@ else fi duplicity remove-older-than $REMOVE_OLDER_THAN file:///$BACKUP_FOLDER --force || exit 1 + duplicity remove-all-but-n-full $REMOVE_ALL_BUT_N_FULL file:///$BACKUP_FOLDER --force || exit 1 + duplicity cleanup file:///$BACKUP_FOLDER --force || exit 1 if [ "$?" != "0" ]; then fatal "Removal of old backups failed." |