.fixtures.yml

@@ -2,6 +2,3 @@ fixtures:
   repositories:
     concat:      'https://github.com/puppetlabs/puppetlabs-concat'
     stdlib:      'https://github.com/puppetlabs/puppetlabs-stdlib.git'
-
-  symlinks:
-    dns: "#{source_dir}"

.travis.yml

@@ -18,19 +18,19 @@ matrix:
     # Acceptance tests
     - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker\,hostname=centos7-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker\,hostname=centos7-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
     - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker\,hostname=debian8-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker\,hostname=debian8-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
     - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker\,hostname=debian9-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker\,hostname=debian9-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [5.3.1](https://github.com/theforeman/puppet-dns/tree/5.3.1) (2018-10-04)
+
+[Full Changelog](https://github.com/theforeman/puppet-dns/compare/5.3.0...5.3.1)
+
+**Merged pull requests:**
+
+- Allow puppetlabs/stdlib 5.x [\#126](https://github.com/theforeman/puppet-dns/pull/126) ([ekohl](https://github.com/ekohl))
+- allow puppetlabs-concat 5.x [\#122](https://github.com/theforeman/puppet-dns/pull/122) ([mmoll](https://github.com/mmoll))
+
 ## [5.3.0](https://github.com/theforeman/puppet-dns/tree/5.3.0) (2018-07-16)
 
 [Full Changelog](https://github.com/theforeman/puppet-dns/compare/5.2.0...5.3.0)
@@ -34,7 +43,7 @@
 ## 5.0.0
 
 * Drop Puppet 3 support
-* Add BIND views support 
+* Add BIND views support
 
 ## 4.1.0
 
@@ -113,3 +122,6 @@
 * Prevent create-rndc key exec changing on every run
 * Puppet 2.6 support deprecated
 * Update gitignore, change fixtures to HTTPS
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -28,8 +28,10 @@ gem 'puppet-lint-version_comparison-check'
 gem 'simplecov'
 gem 'github_changelog_generator', {"git"=>"https://github.com/skywinder/github-changelog-generator", "ref"=>"20ee04ba1234e9e83eb2ffb5056e23d641c7a018", "groups"=>["development"]}
 gem 'puppet-blacksmith', '>= 4.1.0', {"groups"=>["development"]}
-gem 'beaker', '>= 3.9.0', {"groups"=>["system_tests"]}
+gem 'beaker', '>= 4.0.0', {"groups"=>["system_tests"]}
+gem 'beaker-docker', {"groups"=>["system_tests"]}
 gem 'beaker-hostgenerator', '>= 1.1.10', {"groups"=>["system_tests"]}
+gem 'beaker-puppet', {"groups"=>["system_tests"]}
 gem 'beaker-rspec', {"groups"=>["system_tests"]}
 gem 'beaker-module_install_helper', {"groups"=>["system_tests"]}
 gem 'beaker-puppet_install_helper', {"groups"=>["system_tests"]}

HISTORY.md

@@ -0,0 +1,92 @@
+## 5.1.0
+
+* Stop shipping development code in releases
+* Remove EOL operating systems and add new ones
+
+## 5.0.1
+
+* Add a zones parameter
+* Disallow undef values for `$localzonepath` and `$defaultzonepath` in favor of `'unmanaged'` (default parameter)
+
+## 5.0.0
+
+* Drop Puppet 3 support
+* Add BIND views support
+
+## 4.1.0
+
+* Add `$allow_query` parameter for zones.
+* Add `$additional_directives` parameter to define top-scope directives in
+  `named.conf`.
+* Document all class parameters.
+
+## 4.0.0
+
+* Add Arch Linux support
+* Fix README to state the module is under the Apache License 2.0, add full
+  licence text
+* Drop support for Ruby 1.8.7
+
+## 3.4.1
+
+* Do not configure listen-on-v6 parameter if it's not set
+
+## 3.4.0
+
+* Add additional_options parameter to dns class for options without parameters
+
+## 3.3.1
+
+* Skip package installation when dns_server_package is empty
+* Nest 'forwarders' only if 'forward' is used
+* Use concat fragments instead of file resource templates for config
+
+## 3.3.0
+
+* Add dns_notify to dns class and dns::zone define
+* Add acls hash
+* Add controls hash
+* Change default path for zones.conf to /etc/named/zones.conf for the RedHat
+  OS family
+
+## 3.2.0
+* Add empty_zones_enable and forward global parameters
+* Add service_ensure, service_enable parameters to manage service properties
+* Change allow_recursion default to localnets and localhost to prevent open
+  recursion
+* Support Puppet 3.0 minimum
+* Support Fedora 21, remove Debian 6 (Squeeze), add Ubuntu 16.04
+
+## 3.1.0
+* Support configuration on FreeBSD
+* Add namedconf_template/optionsconf_template parameters to override templates
+* Add allow_recursion parameter to control it on a global level
+* Add recursion, allow_query, dnssec_enable and dnssec_validation global
+  parameters
+* Add manage_file, forward and forwarders parameters to dns::zone
+* Add also_notify parameter to dns::zone
+* Change package resource to ensure_packages
+
+## 3.0.0
+* Change theforeman-concat_native to puppetlabs-concat
+* Test with Puppet 4
+
+## 2.0.1
+* Fix template variable lookups under the future parser
+
+## 2.0.0
+* Add masters/allow_transfer parameters to dns::zone to configure master/slave
+  relationships
+* Require that dns is explicitly included, not implicitly included by dns::zone
+* Add and refactor dns::zone parameters
+* Improve dns::zone defaults for soa, soaip etc.
+* Replace dns::zone parameters for zone path and filename
+* Remove unused rndc_alg/secret parameters
+* Improve style and fix linting issues
+* Refresh README
+
+## 1.4.0
+* Add listen_on_v6 parameter
+* Prevent create-rndc key exec changing on every run
+* Puppet 2.6 support deprecated
+* Update gitignore, change fixtures to HTTPS

Rakefile

@@ -32,7 +32,7 @@ begin
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
     metadata = JSON.load(File.read('metadata.json'))
-    config.user = metadata['author']
+    config.user = 'theforeman'
     config.project = "puppet-#{metadata['name'].split('-').last}"
     config.future_release = metadata['version']
     config.exclude_labels = ['duplicate', 'question', 'invalid', 'wontfix', 'Modulesync', 'skip-changelog']

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dns",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "author": "theforeman",
   "summary": "Manage the ISC BIND daemon",
   "license": "Apache-2.0",
@@ -18,11 +18,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.0.0 < 5.0.0"
+      "version_requirement": ">= 1.0.0 < 6.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 5.0.0"
+      "version_requirement": ">= 4.13.1 < 6.0.0"
     }
   ],
   "requirements": [

spec/spec_helper.rb

@@ -7,7 +7,6 @@
 include RspecPuppetFacts
 
                                                                              # Original fact sources:
-add_custom_fact :concat_basedir, '/tmp'                                      # puppetlabs-concat
 add_custom_fact :puppet_environmentpath, '/etc/puppetlabs/code/environments' # puppetlabs-stdlib
 add_custom_fact :root_home, '/root'                                          # puppetlabs-stdlib
 

spec/spec_helper_acceptance.rb

@@ -1,5 +1,5 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
+require 'beaker-puppet'
+require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'