diff options
| author | Cédric Jeanneret <cedric.jeanneret@camptocamp.com> | 2011-08-09 14:26:51 +0200 |
|---|---|---|
| committer | Cédric Jeanneret <cedric.jeanneret@camptocamp.com> | 2011-08-09 14:26:51 +0200 |
| commit | fa66d16ad547f68655b4eab9672592d63821e8ca (patch) | |
| tree | fad8d658f6d34dda2c9e90d157f392b087f51535 | |
| parent | 92193f6c3793b01d33dfa7fcf192d11c36dba276 (diff) | |
| parent | e3fdfb9f8b9bb9ec12ce5d0bd3bc240f48fcfd48 (diff) | |
| download | puppet-bind-fa66d16ad547f68655b4eab9672592d63821e8ca.tar.gz puppet-bind-fa66d16ad547f68655b4eab9672592d63821e8ca.tar.bz2 | |
Merge commit 'e3fdfb9f8b9bb9ec12ce5d0bd3bc240f48fcfd48' into test-bind
| -rw-r--r-- | manifests/classes/bind.pp | 2 | ||||
| -rw-r--r-- | manifests/definitions/bind-zone.pp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/manifests/classes/bind.pp b/manifests/classes/bind.pp index 49f33d1..d9af708 100644 --- a/manifests/classes/bind.pp +++ b/manifests/classes/bind.pp @@ -48,7 +48,7 @@ node "ns1.domain.ltd" { */ class bind { case $operatingsystem { - "Debian": { include bind::debian } + "Debian","Ubuntu": { include bind::debian } default: { fail "Unknown $operatingsystem" } } } diff --git a/manifests/definitions/bind-zone.pp b/manifests/definitions/bind-zone.pp index 4352698..64da5da 100644 --- a/manifests/definitions/bind-zone.pp +++ b/manifests/definitions/bind-zone.pp @@ -29,9 +29,10 @@ define bind::zone($ensure=present, $zone_masters=false) { common::concatfilepart {"bind.zones.${name}": - ensure => $ensure, - notify => Service["bind9"], - file => "/etc/bind/zones/${name}.conf", + ensure => $ensure, + notify => Service["bind9"], + file => "/etc/bind/zones/${name}.conf", + require => Package["bind9"], } common::concatfilepart {"named.local.zone.${name}": @@ -39,6 +40,7 @@ define bind::zone($ensure=present, notify => Service["bind9"], file => "/etc/bind/named.conf.local", content => "include \"/etc/bind/zones/${name}.conf\";\n", + require => Package["bind9"], } if $is_slave { @@ -71,6 +73,7 @@ define bind::zone($ensure=present, ensure => $ensure, file => "/etc/bind/pri/${name}.conf", content => template("bind/zone-header.erb"), + require => Package["bind9"], } file {"/etc/bind/pri/${name}.conf.d": |