From 6b15f6490ce7575a780ccde512a7bc1ec0b29a2f Mon Sep 17 00:00:00 2001
From: Wolodja Wentland <w@babilen5.org>
Date: Mon, 12 Oct 2015 17:21:04 +0200
Subject: [PATCH 1/2] Define pillar default for logrotate:jobs

This allows users to target this states to minions for which no pillar
has been defined (yet).
---
 logrotate/jobs.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logrotate/jobs.sls b/logrotate/jobs.sls
index a4d0ee9..a110b4c 100644
--- a/logrotate/jobs.sls
+++ b/logrotate/jobs.sls
@@ -1,6 +1,6 @@
 # vim: sts=2 ts=2 sw=2 et ai
 {% from "logrotate/map.jinja" import logrotate with context %}
-{% set jobs = salt['pillar.get']('logrotate:jobs') %}
+{% set jobs = salt['pillar.get']('logrotate:jobs', {}) %}
 
 include:
   - logrotate

From 624700a3727fca6f95d1e7600487b572cedd3d40 Mon Sep 17 00:00:00 2001
From: Wolodja Wentland <w@babilen5.org>
Date: Mon, 12 Oct 2015 17:22:12 +0200
Subject: [PATCH 2/2] Use items() in lieu of iteritems()

The iteritems dictionary method has been removed in Python 3 and using
items() is typically no problem in our case due to the fact that
dictionaries are rather small.

This fixes #15
---
 logrotate/jobs.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logrotate/jobs.sls b/logrotate/jobs.sls
index a110b4c..fe3a578 100644
--- a/logrotate/jobs.sls
+++ b/logrotate/jobs.sls
@@ -5,7 +5,7 @@
 include:
   - logrotate
 
-{% for key,value in jobs.iteritems() %}
+{% for key,value in jobs.items() %}
 logrotate_{{key}}:
   file.managed:
     - name: {{ logrotate.include_dir }}/{{ key.split("/")[-1] }}