diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/named-rndc.conf.epp | 5 | ||||
| -rw-r--r-- | templates/named.conf.epp | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/templates/named-rndc.conf.epp b/templates/named-rndc.conf.epp index fd069a5..e69de29 100644 --- a/templates/named-rndc.conf.epp +++ b/templates/named-rndc.conf.epp @@ -1,5 +0,0 @@ -include "<%= $dns::rndc_key_file %>"; - -controls { - inet 127.0.0.1 port 953 allow { 127.0.0.1; } keys { "rndc-key"; }; -}; diff --git a/templates/named.conf.epp b/templates/named.conf.epp index 9fe10b1..5a57452 100644 --- a/templates/named.conf.epp +++ b/templates/named.conf.epp @@ -1,3 +1,7 @@ +# +# File managed by Puppet. Local changes WILL be overwritter', +# + options { directory "<%= $dns::directory %>"; forwarders { 8.8.8.8; 8.8.4.4; }; @@ -9,3 +13,14 @@ options { allow-recursion { localnets; localhost; }; }; + +<%# Equivalent to what rndc-confgen emits %> +include "<%= $dns::rndc_key_file %>"; + +controls { + inet 127.0.0.1 port 953 allow { 127.0.0.1; } keys { "rndc-key"; }; +}; + +<%# Include remaining stuff %> +include "<%= $dns::zoneconf_dir %>/*.conf"; +include "<%= $dns::keyconf_dir %>/*.conf"; |