From c019d1e946483c1f8e406f564c8963bec98c5bf9 Mon Sep 17 00:00:00 2001
From: Skyler Berg <Skyler.Berg@huawei.com>
Date: Thu, 20 Nov 2014 10:31:11 -0800
Subject: [PATCH 1/2] Allow inclusion of arbitrary options

---
 bind/files/debian/named.conf.options | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bind/files/debian/named.conf.options b/bind/files/debian/named.conf.options
index 7661808..c465724 100644
--- a/bind/files/debian/named.conf.options
+++ b/bind/files/debian/named.conf.options
@@ -17,5 +17,10 @@ options {
         auth-nxdomain no;    # conform to RFC1035
         {% if salt['pillar.get']('bind:config:ipv6', 'False') %}
         listen-on-v6 { {{ salt['pillar.get']('bind:config:ipv6_listen', 'any') }}; };
-        {% endif %}
+        {% endif -%}
+
+        {# Allow inclusion of arbitrary statements -#}
+        {% for statement, value in salt['pillar.get']('bind:config:options', {}).iteritems() -%}
+        {{ statement }} {{ value}}
+        {% endfor -%}
 };

From f3dce66398295c0196becc32c0de63a7abce26b8 Mon Sep 17 00:00:00 2001
From: Skyler Berg <Skyler.Berg@huawei.com>
Date: Thu, 20 Nov 2014 10:45:44 -0800
Subject: [PATCH 2/2] Add an example of configuring an arbitrary option to
 pillar.example

---
 pillar.example | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pillar.example b/pillar.example
index cbda55f..9d72ce2 100644
--- a/pillar.example
+++ b/pillar.example
@@ -11,6 +11,8 @@ bind:
     user: root
     group: named
     mode: 640
+    options:
+      allow-recursion: '{ any; };'  # Never include this on a public resolver
 
 bind:
   keys: