summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/classes/bind.pp2
-rw-r--r--manifests/definitions/bind-zone.pp9
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 091b929..6114d9b 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"],
}
}
}