From: Ismaƫl Bouya Date: Sun, 24 Jun 2018 19:25:13 +0000 (+0200) Subject: Add pylog2rotate for backups X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=80225f1917ac5919135af2a4815fce5faf3fa080 Add pylog2rotate for backups --- diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp index b35c542..51b689d 100644 --- a/modules/role/manifests/backup.pp +++ b/modules/role/manifests/backup.pp @@ -17,6 +17,14 @@ class role::backup ( include "role::backup::postgresql" + ensure_packages(["python", "python-pip"]) + package { "pylog2rotate": + source => "git+https://github.com/avian2/pylog2rotate", + ensure => present, + provider => "pip3", + require => Package["python-pip"], + } + ensure_packages(["rsync"]) ssh_keygen { $user: diff --git a/modules/role/manifests/backup/postgresql.pp b/modules/role/manifests/backup/postgresql.pp index e635611..e891195 100644 --- a/modules/role/manifests/backup/postgresql.pp +++ b/modules/role/manifests/backup/postgresql.pp @@ -153,12 +153,19 @@ class role::backup::postgresql inherits role::backup { description => "Backup the database", }, { - command => "/usr/bin/rm -f $(ls -1 $pg_backup_path/*.sql | sort -r | sed -e '1,16d')", + command => "/usr/bin/rm -f $(ls -1 $pg_backup_path/*.sql | grep -v 'T22:' | sort -r | sed -e '1,12d')", user => $pg_user, hour => 3, minute => 0, description => "Cleanup the database backups", }, + { + command => "cd $pg_backup_path ; /usr/bin/rm -f $(ls -1 *T22*.sql | log2rotate --skip 7 --fuzz 7 --delete --format='%Y-%m-%dT%H:%M:%S+02:00.sql')", + user => $pg_user, + hour => 3, + minute => 1, + description => "Cleanup the database backups exponentially", + }, ] }