From 02390fe49e4e779ee1a5a7399625c0120a3c9d4b Mon Sep 17 00:00:00 2001
From: Adam Bolte <abolte@systemsaviour.com>
Date: Thu, 3 Nov 2016 10:48:46 +1100
Subject: [PATCH] Support include and require_in pillar options.

---
 apt-cacher/ng/server.sls | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apt-cacher/ng/server.sls b/apt-cacher/ng/server.sls
index 9a1ffc4..7782c28 100644
--- a/apt-cacher/ng/server.sls
+++ b/apt-cacher/ng/server.sls
@@ -1,6 +1,13 @@
 {% if grains['os_family'] == 'Debian' %}
 {% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context %}
 
+{% if 'include' in apt_cacher_ng %}
+include:
+{% for include_line in apt_cacher_ng.include %}
+  - {{ include_line }}
+{% endfor %}
+{% endif %}
+
 apt-cacher-ng:
   pkg.installed:
     - name: {{ apt_cacher_ng.pkg }}
@@ -13,6 +20,12 @@ apt-cacher-ng:
       - file: {{ apt_cacher_ng.server_config }}
       - file: {{ apt_cacher_ng.server_cache_dir }}
       - file: {{ apt_cacher_ng.server_log_dir }}
+{% if 'require_in' in apt_cacher_ng %}
+    - require_in:
+{% for require_in in apt_cacher_ng.require_in %}
+      - {{ require_in }}
+{% endfor %}
+{% endif %}
 
 {{ apt_cacher_ng.server_config }}:
   file.managed: