CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [9.5.1](https://github.com/theforeman/puppet-dns/tree/9.5.1) (2023-01-31)
+
+[Full Changelog](https://github.com/theforeman/puppet-dns/compare/9.5.0...9.5.1)
+
+**Fixed bugs:**
+
+- Remove legacy fact usage [\#225](https://github.com/theforeman/puppet-dns/pull/225) ([smortex](https://github.com/smortex))
+- logging channel error message typo faility to facility [\#224](https://github.com/theforeman/puppet-dns/pull/224) ([ikonia](https://github.com/ikonia))
+
 ## [9.5.0](https://github.com/theforeman/puppet-dns/tree/9.5.0) (2022-10-28)
 
 [Full Changelog](https://github.com/theforeman/puppet-dns/compare/9.4.0...9.5.0)

manifests/logging/channel.pp

@@ -47,7 +47,7 @@
 
   if $log_type == 'syslog' {
     if empty($syslog_facility) {
-      fail('dns::logging::channel: "syslog_faility" needs to be set with log type syslog')
+      fail('dns::logging::channel: "syslog_facility" needs to be set with log type syslog')
     }
   }
 

manifests/zone.pp

@@ -63,7 +63,7 @@
 define dns::zone (
   Array[String] $target_views                             = [],
   String $zonetype                                        = 'master',
-  String $soa                                             = $fqdn,
+  String $soa                                             = $facts['networking']['fqdn'],
   Boolean $reverse                                        = false,
   String $ttl                                             = '10800',
   Optional[Stdlib::IP::Address::V4] $soaip                = undef,

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dns",
-  "version": "9.5.0",
+  "version": "9.5.1",
   "author": "theforeman",
   "summary": "Manage the ISC BIND daemon",
   "license": "Apache-2.0",

spec/acceptance/dns_spec.rb

@@ -15,7 +15,7 @@
     end
   end
 
-  service_name = fact('osfamily') == 'Debian' ? 'bind9' : 'named'
+  service_name = fact('os.family') == 'Debian' ? 'bind9' : 'named'
 
   describe service(service_name) do
     it { is_expected.to be_enabled }

spec/acceptance/logging_spec.rb

@@ -32,7 +32,7 @@ class { 'dns':
       end
     end
 
-    service_name = fact('osfamily') == 'Debian' ? 'bind9' : 'named'
+    service_name = fact('os.family') == 'Debian' ? 'bind9' : 'named'
 
     describe service(service_name) do
       it { is_expected.to be_enabled }

spec/acceptance/views_spec.rb

@@ -36,7 +36,7 @@ class {'::dns':
       end
     end
 
-    service_name = fact('osfamily') == 'Debian' ? 'bind9' : 'named'
+    service_name = fact('os.family') == 'Debian' ? 'bind9' : 'named'
 
     describe service(service_name) do
       it { is_expected.to be_enabled }

spec/defines/dns_logging_category_spec.rb

@@ -3,7 +3,7 @@
 describe 'dns::logging::category' do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
-      let(:facts) { os_facts.merge(fqdn: 'puppetmaster.example.com') }
+      let(:facts) { override_facts(os_facts, networking: { fqdn: 'puppetmaster.example.com' }) }
       let(:pre_condition) { 'include dns' }
       let(:title) { 'test' }
       let(:logdir) { '/var/log/named' }

spec/defines/dns_logging_channel_spec.rb

@@ -3,7 +3,7 @@
 describe 'dns::logging::channel' do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
-      let(:facts) { os_facts.merge(fqdn: 'puppetmaster.example.com') }
+      let(:facts) { override_facts(os_facts, networking: { fqdn: 'puppetmaster.example.com' }) }
       let(:pre_condition) { 'include dns' }
       let(:title) { 'test' }
       let(:logdir) { '/var/log/named' }

spec/defines/dns_zone_spec.rb

@@ -13,7 +13,7 @@
 
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
-      let(:facts) { os_facts.merge(fqdn: 'puppetmaster.example.com') }
+      let(:facts) { override_facts(os_facts, networking: { fqdn: 'puppetmaster.example.com' }) }
       let(:title) { "example.com" }
       let(:pre_condition) { 'include dns' }
       let(:zonefilepath) do

templates/options.conf.erb

@@ -26,7 +26,7 @@ listen-on-v6 { <%= scope.lookupvar('::dns::listen_on_v6') %>; };
 allow-recursion { <%= scope.lookupvar('::dns::allow_recursion').join("; ") %>; };
 <% end -%>
 
-<% if (@osfamily =~ /^(FreeBSD|DragonFly)$/) -%>
+<% if (@facts['os']['family'] =~ /^(FreeBSD|DragonFly)$/) -%>
 pid-file "/var/run/named/pid";
 <% end -%>