Permalink
Browse files

Finalize the 6.0-prerelease branch

  • Loading branch information...
inkblot committed Jul 4, 2016
1 parent 50e9764 commit 88481f94fd81bd4b9573d2abd3728d9569e36e1e
Showing with 10 additions and 14 deletions.
  1. +5 −5 DEFAULT_ZONES.md
  2. +2 −2 README.md
  3. +0 −1 data/common.yaml
  4. +0 −1 data/osfamily/RedHat.yaml
  5. +0 −1 manifests/defaults.pp
  6. +2 −3 manifests/zone.pp
  7. +1 −1 metadata.json
View
@@ -13,7 +13,7 @@ compliance with [RFC 1912](https://www.ietf.org/rfc/rfc1912.txt). The content
of these zones is standardized, and the zone files for them are maintained by
the package distributor.
## Change Is Coming
## Version 5.x vs. version 6.x of `puppet-bind`
<a name="warning"></a>
### The Warning
@@ -30,10 +30,10 @@ If you are seeing this warning, it is because starting in version 6.0.0 certain
catalog application failures. There are [steps](#configuration-changes) to take
prior to version 6.0.0 to prepare for it.
### The Present: Debian and Red Hat Divergence
### Older versions: Debian and Red Hat Divergence
The treatment of default zones in this module has been different between Debian
and Red Hat systems until now.
The treatment of default zones in versions 5.x and earlier of this module has
differed between Debian and Red Hat systems.
On Debian systems, the `bind9` package installs a separate configuration file
at `/etc/bind/named.conf.default-zones` which defines these zones and also
@@ -49,7 +49,7 @@ rewrites this file, these definitions are lost.
In both cases, the current behavior is not configurable and always happens.
### The Future: Consistency with Flexibility
### Version 6.x and later: Consistency with Flexibility
Starting in version 6.0.0 of this module, default zones will be preserved on
both Debian and Red Hat, with the option of disabling them. This will not
View
@@ -2,8 +2,8 @@
[![Build Status](https://secure.travis-ci.org/inkblot/puppet-bind.png)](http://travis-ci.org/inkblot/puppet-bind)
**IMPORTANT UPGRADE INFORMATION:** In a future version of this module there
will be significant changes to the handling of default zones that may require
**IMPORTANT UPGRADE INFORMATION:** In version 6.0.0 of this module there are
significant changes to the handling of default zones that may require
preparations prior to upgrading. See [DEFAULT_ZONES.md](DEFAULT_ZONES.md) for
details.
View
@@ -2,7 +2,6 @@
bind::defaults::supported: false
bind::defaults::random_device: '/dev/random'
bind::defaults::rndc: true
bind::defaults::default_zones_warning: false
bind::forwarders: ''
bind::dnssec: true
@@ -9,7 +9,6 @@ bind::defaults::managed_keys_directory: '/var/named/dynamic'
bind::defaults::confdir: '/etc/named'
bind::defaults::namedconf: '/etc/named.conf'
bind::defaults::cachedir: '/var/named'
bind::defaults::default_zones_warning: true
bind::defaults::default_zones_include: '/etc/named.default-zones.conf'
bind::defaults::default_zones_source: 'puppet:///modules/bind/RedHat/named.default-zones.conf'
View
@@ -12,7 +12,6 @@
$bind_service = undef,
$nsupdate_package = undef,
$managed_keys_directory = undef,
$default_zones_warning = undef,
$default_zones_include = undef,
$default_zones_source = undef,
) {
View
@@ -29,7 +29,6 @@
$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 @@
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)) {
View
@@ -1,6 +1,6 @@
{
"name": "inkblot/bind",
"version": "5.2.0",
"version": "6.0.0",
"author": "inkblot",
"license": "Apache-2.0",
"summary": "ISC BIND name server",

0 comments on commit 88481f9

Please sign in to comment.