Fixed dns::server for Puppet 2.7

This commit is contained in:
Ossi Salmi 2012-01-18 00:38:27 +02:00
parent 8a729c3e9f
commit 97821c14ac

View file

@ -72,28 +72,7 @@ class dns::server {
require => Exec["rndc-confgen"],
}
case $operatingsystem {
"ubuntu": {
$ipaddr = $dns_listener_ipaddr
file { "${confdir}/named.conf.local":
ensure => present,
content => template("dns/named.conf.local.erb"),
mode => 0640,
owner => "root",
group => "bind",
require => Package["bind"],
notify => Service["named"],
}
file { "${confdir}/named.conf.options":
ensure => present,
content => template("dns/named.conf.options.erb"),
mode => 0640,
owner => "root",
group => "bind",
require => Package["bind"],
notify => Service["named"],
}
define populate_zones {
define populate_zones() {
$zone = $name
file { "${confdir}/db.${zone}":
ensure => present,
@ -125,6 +104,28 @@ class dns::server {
notify => Service["named"],
}
}
case $operatingsystem {
"ubuntu": {
$ipaddr = $dns_listener_ipaddr
file { "${confdir}/named.conf.local":
ensure => present,
content => template("dns/named.conf.local.erb"),
mode => 0640,
owner => "root",
group => "bind",
require => Package["bind"],
notify => Service["named"],
}
file { "${confdir}/named.conf.options":
ensure => present,
content => template("dns/named.conf.options.erb"),
mode => 0640,
owner => "root",
group => "bind",
require => Package["bind"],
notify => Service["named"],
}
populate_zones { $dns_zones: }
}
default: {