Merge branch '6.0-prerelease'

Conflicts:
	metadata.json

manifests/defaults.pp

@@ -12,7 +12,8 @@ class bind::defaults (
     $bind_service           = undef,
     $nsupdate_package       = undef,
     $managed_keys_directory = undef,
-    $default_zones_warning  = undef,
+    $default_zones_include  = undef,
+    $default_zones_source   = undef,
 ) {
     unless is_bool($supported) {
         fail('Please ensure that the dependencies of the bind module are installed and working correctly')

manifests/init.pp

@@ -8,8 +8,8 @@ class bind (
     $rndc                  = undef,
     $statistics_port       = undef,
     $auth_nxdomain         = false,
-    $include_local         = false,
     $include_default_zones = true,
+    $include_local         = false,
 ) inherits bind::defaults {
 
     File {
@@ -63,6 +63,12 @@ class bind (
         content => template('bind/named.conf.erb'),
     }
 
+    if $include_default_zones and $default_zones_source {
+        file { $default_zones_include:
+            source => $default_zones_source,
+        }
+    }
+
     class { 'bind::keydir':
         keydir => "${confdir}/keys",
     }

manifests/view.pp

@@ -16,6 +16,8 @@ define bind::view (
     $minimal_responses            = false,
 ) {
     $confdir = $::bind::confdir
+    $default_zones_include = $::bind::default_zones_include
+    $include_default_zones = $::bind::include_default_zones
 
     concat::fragment { "bind-view-${name}":
         order   => $order,

manifests/zone.pp

@@ -29,7 +29,6 @@ define bind::zone (
     $random_device = $::bind::defaults::random_device
     $bind_user = $::bind::defaults::bind_user
     $bind_group = $::bind::defaults::bind_group
-    $default_zones_warning = $::bind::defaults::default_zones_warning
     $include_default_zones = $::bind::include_default_zones
 
     $_domain = pick($domain, $name)
@@ -38,8 +37,8 @@ define bind::zone (
         default => $_domain
     }
 
-    if $include_default_zones and $default_zones_warning and member(['.', 'localhost', '127.in-addr.arpa', '0.in-addr.arpa', '255.in-addr.arpa'], $_domain) {
-        warning("The bind module will include a default definition for zone \"${_domain}\" starting in version 6.0.0. Please see https://github.com/inkblot/puppet-bind/blob/master/DEFAULT_ZONES.md for more information about how this will affect your configuration.")
+    if $include_default_zones and member(['.', 'localhost', '127.in-addr.arpa', '0.in-addr.arpa', '255.in-addr.arpa'], $_domain) {
+        fail("The bind module includes a default definition for zone \"${_domain}\" starting in version 6.0.0. Please see https://github.com/inkblot/puppet-bind/blob/master/DEFAULT_ZONES.md for more information about how this affects your configuration.")
     }
 
     unless !($masters != '' and ! member(['slave', 'stub'], $zone_type)) {