From 0b027a7c9c8e8dea6263757b56d7f9c5f4076d19 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 2 Dec 2009 19:21:20 +0000 Subject: [PATCH] enable named secondary module Signed-off-by: Stephen Gran --- manifests/site.pp | 1 - modules/named/files/common/named.conf.debian-zones | 2 -- modules/named/manifests/secondary.pp | 10 +++++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index d5b6ab6c8..89096a0a9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -67,7 +67,6 @@ node default { "true": { include buildd } } -# maybe wait for rietz to be upgraded to lenny case $hostname { rietz,raff,klecker: { include named::secondary } } diff --git a/modules/named/files/common/named.conf.debian-zones b/modules/named/files/common/named.conf.debian-zones index a7874dd33..72fe16267 100644 --- a/modules/named/files/common/named.conf.debian-zones +++ b/modules/named/files/common/named.conf.debian-zones @@ -5,8 +5,6 @@ // Slave domains, includ in bind.conf -// NOT USED YET - SYNC UP WITH dsa-misc/config/bind/ before enabling finally - zone "debian.org" { type slave; notify no; diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp index b9615a627..003f1fe4f 100644 --- a/modules/named/manifests/secondary.pp +++ b/modules/named/manifests/secondary.pp @@ -1,8 +1,8 @@ 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"], + } } -- 2.20.1