From: Cédric Jeanneret <cedric.jeanneret@camptocamp.com>
Date: Tue, 9 Aug 2011 12:26:51 +0000 (+0200)
Subject: Merge commit 'e3fdfb9f8b9bb9ec12ce5d0bd3bc240f48fcfd48' into test-bind
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=fa66d16ad547f68655b4eab9672592d63821e8ca;p=puppet-bind.git

Merge commit 'e3fdfb9f8b9bb9ec12ce5d0bd3bc240f48fcfd48' into test-bind
---

fa66d16ad547f68655b4eab9672592d63821e8ca
diff --cc manifests/definitions/bind-zone.pp
index 4352698,6114d9b..64da5da
--- a/manifests/definitions/bind-zone.pp
+++ b/manifests/definitions/bind-zone.pp
@@@ -71,15 -73,7 +73,16 @@@ 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":
 +      ensure => directory,
 +      mode   => 0700,
 +      purge  => true,
 +      recurse => true,
 +      backup  => false,
 +      force   => true,
 +    }
    }
  }