add support for Ubuntu

diff --git a/manifests/classes/bind.pp b/manifests/classes/bind.pp
index 49f33d1bebd8161c5d7b44dc3ff3de57ed05fdf3..d9af70871d8c5acbe017adddabe8ee910d8b2051 100644 (file)
--- 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 091b9293a6a338dc5846638b8584b9c2666ad0ff..6114d9bbfa834e0227c379ece30ba1648f0bae9e 100644 (file)
--- 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"],
     }
   }
 }