Merge pull request #18 from openenvi-formulas/options

Allow inclusion of arbitrary options
This commit is contained in:
Nitin Madhok 2014-11-20 13:49:59 -05:00
commit 8767b5b004
2 changed files with 8 additions and 1 deletions

View file

@ -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 -%}
};

View file

@ -11,6 +11,8 @@ bind:
user: root
group: named
mode: 640
options:
allow-recursion: '{ any; };' # Never include this on a public resolver
bind:
keys: