tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged in oherrala/puppet (pull request #20)

Browse source
This commit is contained in:
Timo Mäkinen 2012-11-30 14:32:01 +02:00
commit 085d67c1c0
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dns/manifests/init.pp
View file

@ -107,6 +107,16 @@ class dns::server {
} }
} }
exec { "named-checkconf":
command => $chroot ? {
"" => "/usr/sbin/named-checkconf -z",
default => "/usr/sbin/named-checkconf -z -t ${chroot}"
},
refreshonly => true,
require => Exec["rndc-confgen"],
notify => Service["named"],
}
service { "named": service { "named":
name => $::operatingsystem ? { name => $::operatingsystem ? {
"ubuntu" => "bind9", "ubuntu" => "bind9",
@ -123,7 +133,6 @@ class dns::server {
"openbsd" => "/usr/sbin/named", "openbsd" => "/usr/sbin/named",
default => undef, default => undef,
}, },
require => Exec["rndc-confgen"],
} }
file { "named.conf": file { "named.conf":
@ -155,7 +164,7 @@ class dns::server {
user => "root", user => "root",
refreshonly => true, refreshonly => true,
require => File["/usr/local/sbin/generate-named-conf.sh"], require => File["/usr/local/sbin/generate-named-conf.sh"],
notify => Service["named"], notify => Exec["named-checkconf"],
} }
file { "${chroot}${confdir}/named.conf.options": file { "${chroot}${confdir}/named.conf.options":
@ -170,7 +179,7 @@ class dns::server {
"openbsd" => undef, "openbsd" => undef,
default => Package["bind"], default => Package["bind"],
}, },
notify => Service["named"], notify => Exec["named-checkconf"],
} }
file { "${chroot}${confdir}/named.conf.local": file { "${chroot}${confdir}/named.conf.local":
@ -185,7 +194,7 @@ class dns::server {
"openbsd" => undef, "openbsd" => undef,
default => Package["bind"], default => Package["bind"],
}, },
notify => Service["named"], notify => Exec["named-checkconf"],
} }
} }
@ -225,7 +234,7 @@ class dns::server::ldap inherits dns::server {
command => "dnsdump.py --notest /var/named/master.in /var/named/master", command => "dnsdump.py --notest /var/named/master.in /var/named/master",
require => File["/usr/local/sbin/dnsdump.py"], require => File["/usr/local/sbin/dnsdump.py"],
unless => "dnsdump.py --test /var/named/master.in /var/named/master", unless => "dnsdump.py --test /var/named/master.in /var/named/master",
notify => Service["named"] notify => Exec["named-checkconf"],
} }
} }
@ -389,7 +398,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"openbsd" => undef, "openbsd" => undef,
default => Package["bind"], default => Package["bind"],
}, },
notify => Service["named"], notify => Exec["named-checkconf"],
} }
file { "${dns::server::chroot}${zonedir}/db.${zone}-dynamic": file { "${dns::server::chroot}${zonedir}/db.${zone}-dynamic":
ensure => present, ensure => present,
@ -405,7 +414,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"openbsd" => undef, "openbsd" => undef,
default => Package["bind"], default => Package["bind"],
}, },
notify => Service["named"], notify => Exec["named-checkconf"],
} }
file { "${dns::server::chroot}${zonedir}/db.${zone}-static": file { "${dns::server::chroot}${zonedir}/db.${zone}-static":
ensure => present, ensure => present,
@ -421,7 +430,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"openbsd" => undef, "openbsd" => undef,
default => Package["bind"], default => Package["bind"],
}, },
notify => Service["named"], notify => Exec["named-checkconf"],
} }
} }
} }
@ -468,5 +477,4 @@ class dns::nsupdate {
minute => "*/5", minute => "*/5",
require => File["/usr/local/sbin/nsupdate.sh"], require => File["/usr/local/sbin/nsupdate.sh"],
} }
} }