From 026d1beb941daad6cf3a1a248fbd031c9b2dcf64 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 7 Mar 2010 20:34:19 +0000 Subject: [PATCH] reshuffle where template is served from Signed-off-by: Stephen Gran --- modules/named/manifests/geodns.pp | 3 +++ modules/named/manifests/init.pp | 3 --- modules/named/manifests/recursor.pp | 5 +++++ modules/named/manifests/secondary.pp | 12 ++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp index 098b112c1..34ec1cd8c 100644 --- a/modules/named/manifests/geodns.pp +++ b/modules/named/manifests/geodns.pp @@ -4,6 +4,9 @@ class named::geodns inherits named { } file { + "/etc/bind/named.conf.options": + content => template("named/named.conf.options.erb"), + notify => Exec["bind9 reload"]; "/etc/apt/sources.list.d/geoip.list": content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"), notify => Exec["apt-get update"], diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp index 050fb7533..8cfa4080c 100644 --- a/modules/named/manifests/init.pp +++ b/modules/named/manifests/init.pp @@ -24,9 +24,6 @@ class named { group => bind, mode => 775, ; - "/etc/bind/named.conf.options": - content => template("named/named.conf.options.erb"), - notify => Exec["bind9 reload"], } @ferm::rule { "dsa-bind": domain => "(ip ip6)", diff --git a/modules/named/manifests/recursor.pp b/modules/named/manifests/recursor.pp index fda2de30d..66227c4b5 100644 --- a/modules/named/manifests/recursor.pp +++ b/modules/named/manifests/recursor.pp @@ -1,4 +1,9 @@ class named::recursor inherits named { + file { + "/etc/bind/named.conf.options": + content => template("named/named.conf.options.erb"), + notify => Exec["bind9 reload"]; + } } diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp index 4f92c5b75..b08685259 100644 --- a/modules/named/manifests/secondary.pp +++ b/modules/named/manifests/secondary.pp @@ -1,8 +1,12 @@ class named::secondary inherits named { - file { "/etc/bind/named.conf.debian-zones": - source => [ "puppet:///named/per-host/$fqdn/named.conf.debian-zones", - "puppet:///named/common/named.conf.debian-zones" ], - notify => Exec["bind9 reload"], + file { + "/etc/bind/named.conf.debian-zones": + source => [ "puppet:///named/per-host/$fqdn/named.conf.debian-zones", + "puppet:///named/common/named.conf.debian-zones" ], + notify => Exec["bind9 reload"]; + "/etc/bind/named.conf.options": + content => template("named/named.conf.options.erb"), + notify => Exec["bind9 reload"]; } file { "/etc/bind/named.conf.shared-keys": mode => 640, -- 2.20.1