Showing with 59 additions and 81 deletions.
  1. +1 −1 .github/workflows/ci.yml
  2. +8 −0 CHANGELOG.md
  3. +2 −1 Gemfile
  4. +19 −3 Rakefile
  5. +28 −28 manifests/init.pp
  6. +0 −47 manifests/params.pp
  7. +1 −1 metadata.json
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
puppet_major_versions: ${{ steps.get_outputs.outputs.puppet_major_versions }}
puppet_unit_test_matrix: ${{ steps.get_outputs.outputs.puppet_unit_test_matrix }}
env:
BUNDLE_WITHOUT: development:release
BUNDLE_WITHOUT: development:system_tests:release
steps:
- uses: actions/checkout@v2
- name: Setup ruby
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [9.1.0](https://github.com/theforeman/puppet-dns/tree/9.1.0) (2021-10-29)

[Full Changelog](https://github.com/theforeman/puppet-dns/compare/9.0.0...9.1.0)

**Implemented enhancements:**

- Move static parameters to init.pp [\#195](https://github.com/theforeman/puppet-dns/pull/195) ([ekohl](https://github.com/ekohl))

## [9.0.0](https://github.com/theforeman/puppet-dns/tree/9.0.0) (2021-07-22)

[Full Changelog](https://github.com/theforeman/puppet-dns/compare/8.2.0...9.0.0)
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
gem 'voxpupuli-test', '~> 1.4'
gem 'voxpupuli-test', '~> 1.4', {"groups"=>["test"]}
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
gem 'puppet_metadata', '~> 0.3'
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]}
gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}

# vim:ft=ruby
22 changes: 19 additions & 3 deletions Rakefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
# This file is managed centrally by modulesync
# https://github.com/theforeman/foreman-installer-modulesync

require 'voxpupuli/test/rake'
# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
# otherwise attempt to load it directly.
begin
require 'voxpupuli/test/rake'
rescue LoadError
begin
require 'puppetlabs_spec_helper/rake_tasks'
rescue LoadError
end
end

# We use fixtures in our modules, which is not the default
task :beaker => 'spec_prep'
# load optional tasks for acceptance
# only available if gem group releases is installed
begin
require 'voxpupuli/acceptance/rake'
rescue LoadError
else
# We use fixtures in our modules, which is not the default
task :beaker => 'spec_prep'
end

# blacksmith isn't always present, e.g. on Travis with --without development
begin
Expand Down
56 changes: 28 additions & 28 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,44 +142,44 @@
Stdlib::Absolutepath $optionspath = $dns::params::optionspath,
Stdlib::Absolutepath $publicviewpath = $dns::params::publicviewpath,
Stdlib::Absolutepath $vardir = $dns::params::vardir,
Stdlib::Absolutepath $logdir = $dns::params::logdir,
Boolean $group_manage = $dns::params::group_manage,
Boolean $manage_service = $dns::params::manage_service,
Stdlib::Absolutepath $logdir = '/var/log/named',
Boolean $group_manage = true,
Boolean $manage_service = true,
String $namedservicename = $dns::params::namedservicename,
Stdlib::Absolutepath $zonefilepath = $dns::params::zonefilepath,
Variant[Enum['unmanaged'], Stdlib::Absolutepath] $localzonepath = $dns::params::localzonepath,
Variant[Enum['unmanaged'], Stdlib::Absolutepath] $defaultzonepath = $dns::params::defaultzonepath,
Optional[Enum['only', 'first']] $forward = $dns::params::forward,
Array[String] $forwarders = $dns::params::forwarders,
Optional[Variant[String, Boolean]] $listen_on_v6 = $dns::params::listen_on_v6,
Enum['yes', 'no'] $recursion = $dns::params::recursion,
Array[String] $allow_recursion = $dns::params::allow_recursion,
Array[String] $allow_query = $dns::params::allow_query,
Enum[yes, no] $empty_zones_enable = $dns::params::empty_zones_enable,
Optional[Enum['yes', 'no', 'explicit']] $dns_notify = $dns::params::dns_notify,
Enum['yes', 'no'] $dnssec_enable = $dns::params::dnssec_enable,
Enum['yes', 'no', 'auto'] $dnssec_validation = $dns::params::dnssec_validation,
String $namedconf_template = $dns::params::namedconf_template,
Hash[String, Array[String]] $acls = $dns::params::acls,
String $optionsconf_template = $dns::params::optionsconf_template,
Optional[Enum['only', 'first']] $forward = undef,
Array[String] $forwarders = [],
Optional[Variant[String, Boolean]] $listen_on_v6 = 'any',
Enum['yes', 'no'] $recursion = 'yes',
Array[String] $allow_recursion = ['localnets', 'localhost'],
Array[String] $allow_query = ['any'],
Enum['yes', 'no'] $empty_zones_enable = 'yes',
Optional[Enum['yes', 'no', 'explicit']] $dns_notify = undef,
Enum['yes', 'no'] $dnssec_enable = 'yes',
Enum['yes', 'no', 'auto'] $dnssec_validation = 'yes',
String $namedconf_template = 'dns/named.conf.erb',
Hash[String, Array[String]] $acls = {},
String $optionsconf_template = 'dns/options.conf.erb',
Optional[Stdlib::Absolutepath] $sysconfig_file = $dns::params::sysconfig_file,
Optional[String] $sysconfig_template = $dns::params::sysconfig_template,
Optional[String] $sysconfig_startup_options = $dns::params::sysconfig_startup_options,
Optional[Boolean] $sysconfig_resolvconf_integration = $dns::params::sysconfig_resolvconf_integration,
Optional[Boolean] $sysconfig_disable_zone_checking = $dns::params::sysconfig_disable_zone_checking,
Optional[Hash[String[1], String]] $sysconfig_additional_settings = $dns::params::sysconfig_additional_settings,
Optional[Hash[String[1], String]] $sysconfig_additional_settings = {},
Hash[String, Hash[String, Data]] $controls = $dns::params::controls,
Variant[Enum['running', 'stopped'], Boolean] $service_ensure = $dns::params::service_ensure,
Boolean $service_enable = $dns::params::service_enable,
Optional[String[1]] $service_restart_command = $dns::params::service_restart_command,
Boolean $config_check = $dns::params::config_check,
Hash[String, Data] $additional_options = $dns::params::additional_options,
Array[String] $additional_directives = $dns::params::additional_directives,
Boolean $enable_views = $dns::params::enable_views,
Hash[String, Hash] $zones = $dns::params::zones,
Hash[String, Hash] $keys = $dns::params::keys,
Hash[String, Hash] $logging_categories = $dns::params::logging_categories,
Hash[String, Hash] $logging_channels = $dns::params::logging_channels,
Variant[Enum['running', 'stopped'], Boolean] $service_ensure = 'running',
Boolean $service_enable = true,
Optional[String[1]] $service_restart_command = undef,
Boolean $config_check = true,
Hash[String, Data] $additional_options = {},
Array[String] $additional_directives = [],
Boolean $enable_views = false,
Hash[String, Hash] $zones = {},
Hash[String, Hash] $keys = {},
Hash[String, Hash] $logging_categories = {},
Hash[String, Hash] $logging_channels = {},
) inherits dns::params {

include dns::install
Expand Down
47 changes: 0 additions & 47 deletions manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,63 +97,16 @@
}
}

# This module will manage the system group by default
$group_manage = true

# Don't set any restart command by default, let Puppet use the
# platform-dependent service resource default when handling the service
# restart.
$service_restart_command = undef

$namedconf_template = 'dns/named.conf.erb'
$optionsconf_template = 'dns/options.conf.erb'

$sysconfig_additional_settings = {}

$namedconf_path = "${dnsdir}/named.conf"

$logdir = '/var/log/named'

#pertaining to rndc
$rndckeypath = "${dnsdir}/rndc.key"

$enable_views = false

$forward = undef
$forwarders = []

$listen_on_v6 = 'any'

$recursion = 'yes'
$allow_recursion = [ 'localnets', 'localhost' ]
$allow_query = [ 'any' ]

$empty_zones_enable = 'yes'

$dns_notify = undef

$dnssec_enable = 'yes'
$dnssec_validation = 'yes'

$controls = {
'127.0.0.1' => {
'port' => 953,
'allowed_addresses' => [ '127.0.0.1' ],
'keys' => [ 'rndc-key' ],
},
}

$manage_service = true
$service_ensure = 'running'
$service_enable = true
$config_check = true
$acls = {}

$additional_options = {}
$additional_directives = []

$zones = {}
$keys = {}
$logging_categories = {}
$logging_channels = {}
}
2 changes: 1 addition & 1 deletion metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-dns",
"version": "9.0.0",
"version": "9.1.0",
"author": "theforeman",
"summary": "Manage the ISC BIND daemon",
"license": "Apache-2.0",
Expand Down