Add control over whether backups are rotated or not, rotate by date.

Author: natefoo

README.md

@@ -96,7 +96,13 @@ Role Variables
 ### Backups ###
 
 - `postgresql_backup_dir`: If set, enables [PITR][postgresql_pitr] backups. Set
-  this to a directory where your database will be backed up.
+  this to a directory where your database will be backed up. The most recent
+  backup will be in a subdirectory named `current`.
+
+- `postgresql_backup_rotate`: Boolean, defaults to `true`, which will cause the
+  `current` directory to be renamed prior to creating a new backup. If set to
+  `false`, `current` will be deleted (this is useful if you are using snapshots
+  or some other means to archive previous backups).
 
 - `postgresql_backup_local_dir`: Filesystem path on the PostgreSQL server where
   backup scripts will be placed and working WALs will be written prior to a WAL

defaults/main.yml

@@ -4,3 +4,4 @@ postgresql_default_version: 9.4
 postgresql_backup_local_dir: ~postgres/backup
 postgresql_backup_active_dir: "{{ postgresql_backup_local_dir }}/active"
 postgresql_backup_mail_recipient: postgres
+postgresql_backup_rotate: true

templates/archive_wal.sh.j2

@@ -12,7 +12,7 @@ file=$2
 server=`hostname`
 
 active_dir='{{ postgresql_backup_active_dir }}'
-backup_dir="{{ postgresql_backup_dir }}/$server/current/wal"
+backup_dir="{{ postgresql_backup_dir }}/current/wal"
 mutex="{{ postgresql_backup_local_dir }}/walmutex"
 mailto='{{ postgresql_backup_mail_recipient }}'
 mutex_attempts=50

templates/scheduled_backup.sh.j2

@@ -5,11 +5,10 @@
 
 server=`hostname`
 data='{{ postgresql_pgdata }}'
-dir="{{ postgresql_backup_dir }}/$server/current"
-old="{{ postgresql_backup_dir }}/$server/previous"
-older="{{ postgresql_backup_dir }}/$server/older"
+dir='{{ postgresql_backup_dir }}/current'
 mailto='{{ postgresql_backup_mail_recipient }}'
-mutex="{{ postgresql_backup_local_dir }}/nightlymutex"
+mutex='{{ postgresql_backup_local_dir }}/nightlymutex'
+rotate='{{ postgresql_backup_rotate | default("True") }}'
 
 handler()
 {
@@ -64,19 +63,13 @@ start=`date +%s`
 
 echo "nightly $$" > $mutex
 
-# remove oldest backup
-if [ -d $older ]; then
-    handler rm -rf $older
-fi
-
-# move old backup to older backup
-if [ -d $old ]; then
-    handler mv $old $older
-fi
-
-# move current backup to old backup
+# move previous backup
 if [ -d $dir ]; then
-    handler mv $dir $old
+    if [ $rotate = "True" ]; then
+        handler mv $dir {{ postgresql_backup_dir }}/`date -u +%Y%m%dT%H%M%SZ`
+    else
+        handler rm -rf $dir
+    fi
 fi
 
 # set up new directory