From c21ed2f1005d1c2fc0eb78a08b480d7907a10887 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mon, 16 Jan 2012 15:14:24 +0000 Subject: fix the way we overload bind configuration, since previous way was ineffective ( and thus was working by pure chance ) --- modules/bind/manifests/init.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'modules/bind') diff --git a/modules/bind/manifests/init.pp b/modules/bind/manifests/init.pp index 44ca191a..61891196 100644 --- a/modules/bind/manifests/init.pp +++ b/modules/bind/manifests/init.pp @@ -15,13 +15,13 @@ class bind { exec { "named_reload": command => "service named reload", refreshonly => true, - } - } + } - file { '/var/lib/named/etc/named.conf': - require => Package["bind"], - content => "", - notify => [Service['named']] + file { '/var/lib/named/etc/named.conf': + require => Package["bind"], + content => "", + notify => Service['named'], + } } define zone_base($content = false) { @@ -56,14 +56,14 @@ class bind { Tld_redirections::Domain <<| |>> $managed_tlds = list_exported_ressources('Tld_redirections::Domain') - file { '/var/lib/named/etc/named.conf': + File { '/var/lib/named/etc/named.conf': content => template("bind/named_base.conf", "bind/named_master.conf"), } } class bind_slave inherits bind_base { $managed_tlds = list_exported_ressources('Tld_redirections::Domain') - file { '/var/lib/named/etc/named.conf': + File { '/var/lib/named/etc/named.conf': content => template("bind/named_base.conf", "bind/named_slave.conf"), } } -- cgit v1.2.1