From dbd62982af66658f4d50e06ba125cc60545b59a3 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 18 Oct 2009 01:10:12 +0100 Subject: [PATCH] some class reshuffling Signed-off-by: Stephen Gran --- manifests/site.pp | 12 +++++----- modules/named-secondary/manifests/init.pp | 13 ----------- .../files/common/GeoIPv6.dat | Bin .../files/common/authorized_keys | 0 .../files/common/named.conf.acl | 0 .../files/common/named.conf.debian-zones | 0 .../files/common/named.conf.geo | 0 .../files/common/named.conf.local | 0 .../files/common/named.conf.options | 0 .../{geodns => named}/files/common/recvconf | 0 .../files/common/recvconf.files | 0 .../init.pp => named/manifests/geodns.pp} | 15 +----------- modules/named/manifests/init.pp | 22 ++++++++++++++++++ modules/named/manifests/secondary.pp | 8 +++++++ 14 files changed, 37 insertions(+), 33 deletions(-) delete mode 100644 modules/named-secondary/manifests/init.pp rename modules/{geodns => named}/files/common/GeoIPv6.dat (100%) rename modules/{geodns => named}/files/common/authorized_keys (100%) rename modules/{geodns => named}/files/common/named.conf.acl (100%) rename modules/{named-secondary => named}/files/common/named.conf.debian-zones (100%) rename modules/{geodns => named}/files/common/named.conf.geo (100%) rename modules/{geodns => named}/files/common/named.conf.local (100%) rename modules/{geodns => named}/files/common/named.conf.options (100%) rename modules/{geodns => named}/files/common/recvconf (100%) rename modules/{geodns => named}/files/common/recvconf.files (100%) rename modules/{geodns/manifests/init.pp => named/manifests/geodns.pp} (92%) create mode 100644 modules/named/manifests/init.pp create mode 100644 modules/named/manifests/secondary.pp diff --git a/manifests/site.pp b/manifests/site.pp index d8f1b09cb..337f9c57c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -67,16 +67,16 @@ node default { # maybe wait for rietz to be upgraded to lenny -# case $hostname { -# rietz,raff,klecker: -# { include named-secondary } -# default: {} -# } + case $hostname { + rietz,raff,klecker: + { include named::secondary } + default: {} + } case $hostname { geo1,geo2,geo3: { - include geodns + include named::geodns include ntp::server } default: { diff --git a/modules/named-secondary/manifests/init.pp b/modules/named-secondary/manifests/init.pp deleted file mode 100644 index 8c61c5065..000000000 --- a/modules/named-secondary/manifests/init.pp +++ /dev/null @@ -1,13 +0,0 @@ -class named-secondary { - file { "/etc/bind/named.conf.debian-zones": - source => [ "puppet:///named-secondary/per-host/$fqdn/named.conf.debian-zones", - "puppet:///named-secondary/common/named.conf.debian-zones" ], - notify => Exec["bind9 reload"], - } - - exec { "bind9 reload": - path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", - refreshonly => true, - } -} - diff --git a/modules/geodns/files/common/GeoIPv6.dat b/modules/named/files/common/GeoIPv6.dat similarity index 100% rename from modules/geodns/files/common/GeoIPv6.dat rename to modules/named/files/common/GeoIPv6.dat diff --git a/modules/geodns/files/common/authorized_keys b/modules/named/files/common/authorized_keys similarity index 100% rename from modules/geodns/files/common/authorized_keys rename to modules/named/files/common/authorized_keys diff --git a/modules/geodns/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl similarity index 100% rename from modules/geodns/files/common/named.conf.acl rename to modules/named/files/common/named.conf.acl diff --git a/modules/named-secondary/files/common/named.conf.debian-zones b/modules/named/files/common/named.conf.debian-zones similarity index 100% rename from modules/named-secondary/files/common/named.conf.debian-zones rename to modules/named/files/common/named.conf.debian-zones diff --git a/modules/geodns/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo similarity index 100% rename from modules/geodns/files/common/named.conf.geo rename to modules/named/files/common/named.conf.geo diff --git a/modules/geodns/files/common/named.conf.local b/modules/named/files/common/named.conf.local similarity index 100% rename from modules/geodns/files/common/named.conf.local rename to modules/named/files/common/named.conf.local diff --git a/modules/geodns/files/common/named.conf.options b/modules/named/files/common/named.conf.options similarity index 100% rename from modules/geodns/files/common/named.conf.options rename to modules/named/files/common/named.conf.options diff --git a/modules/geodns/files/common/recvconf b/modules/named/files/common/recvconf similarity index 100% rename from modules/geodns/files/common/recvconf rename to modules/named/files/common/recvconf diff --git a/modules/geodns/files/common/recvconf.files b/modules/named/files/common/recvconf.files similarity index 100% rename from modules/geodns/files/common/recvconf.files rename to modules/named/files/common/recvconf.files diff --git a/modules/geodns/manifests/init.pp b/modules/named/manifests/geodns.pp similarity index 92% rename from modules/geodns/manifests/init.pp rename to modules/named/manifests/geodns.pp index 9df371358..e9ef8efd7 100644 --- a/modules/geodns/manifests/init.pp +++ b/modules/named/manifests/geodns.pp @@ -1,10 +1,4 @@ -class geodns { - include munin-node::bind - - package { - bind9: ensure => installed; - } - +class named::geodns inherits named { file { "/etc/apt/sources.list.d/geoip.list": content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"), @@ -86,13 +80,6 @@ class geodns { mode => 775, ; } - - exec { - "bind9 restart": - path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", - refreshonly => true, - ; - } } # vim: set fdm=marker ts=8 sw=8 et: diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp new file mode 100644 index 000000000..0c75aebf0 --- /dev/null +++ b/modules/named/manifests/init.pp @@ -0,0 +1,22 @@ +class named { + include munin-node::bind + + package { + bind9: ensure => installed; + } + + exec { + "bind9 restart": + path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", + refreshonly => true, + ; + } + exec { + "bind9 reload": + path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", + refreshonly => true, + ; + } +} + +# vim: set fdm=marker ts=8 sw=8 et: diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp new file mode 100644 index 000000000..9209aa7e4 --- /dev/null +++ b/modules/named/manifests/secondary.pp @@ -0,0 +1,8 @@ +class named::secondary inherits named { +# file { "/etc/bind/named.conf.debian-zones": +# source => [ "puppet:///named-secondary/per-host/$fqdn/named.conf.debian-zones", +# "puppet:///named-secondary/common/named.conf.debian-zones" ], +# notify => Exec["bind9 reload"], +# } +} + -- 2.20.1