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

Merge tmakinen/puppet

Browse source 
Conflicts:
	dns/manifests/init.pp
This commit is contained in:
Ossi Salmi 2012-12-03 00:23:32 +02:00
commit 29c6eb5b4d
9 changed files with 194 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
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":
name => $::operatingsystem ? {
"ubuntu" => "bind9",
@ -123,7 +133,6 @@ class dns::server {
"openbsd" => "/usr/sbin/named",
default => undef,
},
require => Exec["rndc-confgen"],
}
file { "named.conf":
@ -155,7 +164,7 @@ class dns::server {
user => "root",
refreshonly => true,
require => File["/usr/local/sbin/generate-named-conf.sh"],
notify => Service["named"],
notify => Exec["named-checkconf"],
}
file { "${chroot}${confdir}/named.conf.options":
@ -170,7 +179,7 @@ class dns::server {
"openbsd" => undef,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
file { "${chroot}${confdir}/named.conf.local":
@ -185,7 +194,7 @@ class dns::server {
"openbsd" => undef,
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",
require => File["/usr/local/sbin/dnsdump.py"],
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,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
file { "${dns::server::chroot}${zonedir}/db.${zone}-dynamic":
@ -401,7 +410,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"openbsd" => undef,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
file { "${dns::server::chroot}${zonedir}/db.${zone}-dynamic.d":
ensure => directory,
@ -423,6 +432,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
ensure => present,
source => [
"puppet:///files/dns/db.${zone}-static.${homename}",
"puppet:///files/dns/db.${zone}-static",
"puppet:///modules/dns/empty",
],
mode => "0640",
@ -432,7 +442,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"openbsd" => undef,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
exec { "update-db.${zone}-dynamic":
@ -585,5 +595,4 @@ class dns::nsupdate {
minute => "*/5",
require => File["/usr/local/sbin/nsupdate.sh"],
}
}