From aa5dbdaa983a2f3a232881abacc309cc3182eae9 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 24 Jan 2010 18:29:42 +0000 Subject: [PATCH] start to normalize named.conf.options for secondaries Signed-off-by: Stephen Gran --- .../files/common/named.conf.options-secondary | 25 +++++++++++++++ .../named.conf.options-secondary | 32 +++++++++++++++++++ modules/named/manifests/secondary.pp | 5 +++ 3 files changed, 62 insertions(+) create mode 100644 modules/named/files/common/named.conf.options-secondary create mode 100644 modules/named/files/per-host/ravel.debian.org/named.conf.options-secondary diff --git a/modules/named/files/common/named.conf.options-secondary b/modules/named/files/common/named.conf.options-secondary new file mode 100644 index 00000000..4182a48c --- /dev/null +++ b/modules/named/files/common/named.conf.options-secondary @@ -0,0 +1,25 @@ +// +// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. +// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git +// + +options { + directory "/var/cache/bind"; + + allow-recursion { localnets; 192.25.206.33; }; + allow-query { localnets; 192.25.206.33; }; + + auth-nxdomain no; + listen-on-v6 { any; }; +}; + +logging { + + channel queries { + file "/var/log/bind9/named-query.log" versions 4 size 40m; + print-time yes; + print-category yes; + }; + category queries { queries; }; + category lame-servers { null; }; +}; diff --git a/modules/named/files/per-host/ravel.debian.org/named.conf.options-secondary b/modules/named/files/per-host/ravel.debian.org/named.conf.options-secondary new file mode 100644 index 00000000..0d9e062e --- /dev/null +++ b/modules/named/files/per-host/ravel.debian.org/named.conf.options-secondary @@ -0,0 +1,32 @@ +// +// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. +// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git +// + +acl debian-ubcece { + 127.0.0.0/8; + 137.82.84.64/27; + 206.12.19.0/24; + 192.168.2.0/24; +}; + +options { + directory "/var/cache/bind"; + + allow-recursion { localnets; 192.25.206.33; }; + allow-query { localnets; 192.25.206.33; }; + + auth-nxdomain no; + listen-on-v6 { any; }; +}; + +logging { + + channel queries { + file "/var/log/bind9/named-query.log" versions 4 size 40m; + print-time yes; + print-category yes; + }; + category queries { queries; }; + category lame-servers { null; }; +}; diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp index 8d00d0af..3742eec4 100644 --- a/modules/named/manifests/secondary.pp +++ b/modules/named/manifests/secondary.pp @@ -4,6 +4,11 @@ class named::secondary inherits named { "puppet:///named/common/named.conf.debian-zones" ], notify => Exec["bind9 reload"], } + file { "/etc/bind/named.conf.options": + source => [ "puppet:///named/per-host/$fqdn/named.conf.options-secondary", + "puppet:///named/common/named.conf.options-secondary" ], + notify => Exec["bind9 reload"], + } file { "/etc/bind/named.conf.shared-keys": mode => 640, owner => root, -- 2.39.2