aboutsummaryrefslogtreecommitdiffstats
path: root/modules/bind
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-16 15:14:24 +0000
committerMichael Scherer <misc@mageia.org>2012-01-16 15:14:24 +0000
commitc21ed2f1005d1c2fc0eb78a08b480d7907a10887 (patch)
tree91afaa8d04004a9177c84109d8b6f74381bf61ab /modules/bind
parent2966e7eb15b1d6ed2bdebf2d959fdc8a0d39a1ad (diff)
downloadpuppet-c21ed2f1005d1c2fc0eb78a08b480d7907a10887.tar
puppet-c21ed2f1005d1c2fc0eb78a08b480d7907a10887.tar.gz
puppet-c21ed2f1005d1c2fc0eb78a08b480d7907a10887.tar.bz2
puppet-c21ed2f1005d1c2fc0eb78a08b480d7907a10887.tar.xz
puppet-c21ed2f1005d1c2fc0eb78a08b480d7907a10887.zip
fix the way we overload bind configuration, since previous way was
ineffective ( and thus was working by pure chance )
Diffstat (limited to 'modules/bind')
-rw-r--r--modules/bind/manifests/init.pp16
1 files changed, 8 insertions, 8 deletions
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"),
}
}