From d9ab865fd90d584763882fb8e875337baa83ea86 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <kris@lamoureux.io>
Date: Fri, 4 Jun 2021 00:50:14 -0400
Subject: [PATCH] Use a list for the expected ordering of intervals

---
 dev/host_vars/rsnapshot.yml                 | 6 ++++--
 roles/rsnapshot/templates/rsnapshot.conf.j2 | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev/host_vars/rsnapshot.yml b/dev/host_vars/rsnapshot.yml
index 55a37aa..64a791e 100644
--- a/dev/host_vars/rsnapshot.yml
+++ b/dev/host_vars/rsnapshot.yml
@@ -25,8 +25,10 @@ nginx_version: latest
 rsnapshot:
   - name: webserver
     intervals:
-      hourly: 6
-      daily: 4
+      - name: hourly
+        count: 6
+      - name: daily
+        count: 4
     cron:
       - interval: hourly
         minute: "*/2" # every even minute
diff --git a/roles/rsnapshot/templates/rsnapshot.conf.j2 b/roles/rsnapshot/templates/rsnapshot.conf.j2
index 4480f05..bedf085 100644
--- a/roles/rsnapshot/templates/rsnapshot.conf.j2
+++ b/roles/rsnapshot/templates/rsnapshot.conf.j2
@@ -44,8 +44,8 @@ cmd_rsnapshot_diff	/usr/bin/rsnapshot-diff
 # backup intervals #
 ####################
 
-{% for backup in item.intervals %}
-retain	{{ backup }}	{{ item.intervals[backup] }}
+{% for interval in item.intervals %}
+retain	{{ interval.name }}	{{ interval.count }}
 {% endfor %}
 
 ############################################