rocky9 support with postgres backend

data/os/RedHat.yaml

@@ -2,7 +2,7 @@
 powerdns::db_dir: /var/lib/powerdns
 powerdns::db_file: "%{lookup('powerdns::db_dir')}/powerdns.sqlite3"
 powerdns::mysql_schema_file: /usr/share/doc/pdns-backend-mysql-4.8.1/schema.mysql.sql
-powerdns::pgsql_schema_file: /usr/share/doc/pdns-backend-postgresql-4.8.1/schema.pgsql.sql
+powerdns::pgsql_schema_file: /usr/share/doc/pdns-backend-postgresql/schema.pgsql.sql
 powerdns::sqlite_schema_file: /usr/share/doc/pdns-backend-sqlite-4.8.1/schema.sqlite.sql
 powerdns::mysql_backend_package_name: pdns-backend-mysql
 powerdns::ldap_backend_package_name: pdns-backend-ldap

data/os/RedHat_CentOS.yaml

@@ -0,0 +1,8 @@
+---
+powerdns::supporting_repos:
+  crb:
+    descr: 'CentOS Linux $releasever - CRB'
+    enabled: true
+    gpgcheck: true
+    gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial'
+    mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=CRB&infra=$infra'

data/os/RedHat_CentOS_8.yaml

@@ -0,0 +1,8 @@
+---
+powerdns::supporting_repos:
+  powertools:
+    descr: 'CentOS Linux $releasever - PowerTools'
+    enabled: true
+    gpgcheck: true
+    gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial'
+    mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra'

data/os/RedHat_Rocky.yaml

@@ -0,0 +1,8 @@
+---
+powerdns::supporting_repos:
+  crb:
+    descr: 'Rocky Linux $releasever - CRB'
+    enabled: true
+    gpgcheck: true
+    gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial'
+    mirrorlist: 'https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever'

data/os/RedHat_Rocky_8.yaml

@@ -0,0 +1,8 @@
+---
+powerdns::supporting_repos:
+  powertools:
+    descr: 'Rocky Linux $releasever - PowerTools'
+    enabled: true
+    gpgcheck: true
+    gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial'
+    mirrorlist: 'https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever'

hiera.yaml

@@ -6,16 +6,21 @@ defaults:  # Used for any hierarchy level that omits these keys.
   data_hash: yaml_data  # Use the built-in YAML backend.
 
 hierarchy:
-  - name: "osfamily/major release"
+  - name: "family & name & major release"
     paths:
         # Used to distinguish between Debian and Ubuntu
-      - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
-      - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
+      - "os/%{facts.os.family}_%{facts.os.name}_%{facts.os.release.major}.yaml"
+  - name: "family & major release"
+    paths:
+        # Used to distinguish between Debian and Ubuntu
+      - "os/%{facts.os.family}_%{facts.os.release.major}.yaml"
         # Used for Solaris
-      - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
-  - name: "osfamily"
+      - "os/%{facts.os.family}_%{facts.kernelrelease}.yaml"
+  - name: "family & name"
+    paths:
+      - "os/%{facts.os.family}_%{facts.os.name}.yaml"
+  - name: "family"
     paths:
-      - "os/%{facts.os.name}.yaml"
       - "os/%{facts.os.family}.yaml"
   - name: 'common'
     path: 'common.yaml'

manifests/authoritative.pp

@@ -1,5 +1,9 @@
 # powerdns::authoritative
+#
+# @param group
+#   Name of the group associated with the pdns authoritative service - needed to ensure the config file can be read.
 class powerdns::authoritative (
+  String $group = 'pdns',
 ) inherits powerdns {
   # install the powerdns package
   package { $powerdns::authoritative_package_name:
@@ -10,6 +14,14 @@
 
   include "powerdns::backends::${powerdns::backend}"
 
+  file { $powerdns::authoritative_config:
+    ensure => 'file',
+    owner  => 'root',
+    group  => $group,
+    mode   => '0640',
+    before => Service['pdns'],
+  }
+
   service { 'pdns':
     ensure  => running,
     name    => $powerdns::authoritative_service_name,

manifests/init.pp

@@ -12,6 +12,9 @@
 #   Records database will be split into this number of shards
 # @param lmdb_sync_mode
 #   Sync mode for LMDB. One of 'nosync', 'sync', 'nometasync', 'mapasync'
+# @param supporting_repos
+#   Additional repos that include dependencies for pdns on this OS. Currently
+#   only used by RedHat derivatives
 #
 class powerdns (
   String[1] $authoritative_package_name,
@@ -65,6 +68,7 @@
   Hash $forward_zones = {},
   Powerdns::Autoprimaries $autoprimaries = {},
   Boolean $purge_autoprimaries = false,
+  Hash[String,Hash] $supporting_repos = {}
 ) {
   # Do some additional checks. In certain cases, some parameters are no longer optional.
   if $authoritative {

manifests/repo.pp

@@ -1,5 +1,5 @@
 # powerdns::repo
-class powerdns::repo inherits powerdns {
+class powerdns::repo {
   # The repositories of PowerDNS use a version such as '40' for version 4.0
   # and 41 for version 4.1.
   $authoritative_short_version = regsubst($powerdns::authoritative_version, /^(\d+)\.(\d+)(?:\.\d+)?$/, '\\1\\2', 'G')
@@ -14,21 +14,10 @@
       Yumrepo['powerdns'] -> Package <| title == $powerdns::authoritative_package_name |>
       Yumrepo['powerdns-recursor'] -> Package <| title == $powerdns::recursor_package_name |>
 
-      if ($facts['os']['name'] == 'Rocky') {
-        $mirrorlist = "https://mirrors.rockylinux.org/mirrorlist?arch=\$basearch&repo=PowerTools-\$releasever"
-        $gpgkey = 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial'
-      } else {
-        $mirrorlist = "http://mirrorlist.centos.org/?release=\$releasever&arch=\$basearch&repo=PowerTools&infra=\$infra"
-        $gpgkey = 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial'
-      }
-
-      yumrepo { 'powertools':
-        ensure     => 'present',
-        descr      => 'PowerTools',
-        mirrorlist => $mirrorlist,
-        enabled    => 'true',
-        gpgkey     => $gpgkey,
-        gpgcheck   => 'true',
+      $powerdns::supporting_repos.each |$repo_name, $repo_data| {
+        yumrepo { $repo_name:
+          * => $repo_data,
+        }
       }
 
       yumrepo { 'powerdns':

metadata.json

@@ -33,8 +33,7 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "8",
-        "9"
+        "8"
       ]
     },
     {

spec/classes/powerdns_init_spec.rb

@@ -115,16 +115,40 @@
           case facts[:osfamily]
           when 'RedHat'
             it { is_expected.to contain_package('yum-plugin-priorities') } if facts[:operatingsystemmajrelease].to_i < 8
-            it { is_expected.to contain_yumrepo('powertools') } if facts[:operatingsystemmajrelease].to_i >= 8
-            if facts[:operatingsystem] != 'Rocky' && facts[:operatingsystemmajrelease].to_i >= 8
-              it {
-                is_expected.to contain_yumrepo('powertools').with('mirrorlist' => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra')
-              }
-            end
-            if facts[:operatingsystem] == 'Rocky' && facts[:operatingsystemmajrelease].to_i >= 8
-              it {
-                is_expected.to contain_yumrepo('powertools').with('mirrorlist' => 'https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever')
-              }
+            case facts[:operatingsystemmajrelease]
+            when '8'
+              it { is_expected.to contain_yumrepo('powertools') }
+              if facts[:operatingsystem] != 'Rocky'
+                it {
+                  is_expected.to contain_yumrepo('powertools').with(
+                    'mirrorlist' => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra',
+                  )
+                }
+              end
+              if facts[:operatingsystem] == 'Rocky'
+                it {
+                  is_expected.to contain_yumrepo('powertools').with(
+                    'mirrorlist' => 'https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever',
+                  )
+                }
+              end
+            when '9'
+              it { is_expected.to contain_yumrepo('crb') }
+              if facts[:operatingsystem] == 'Rocky'
+                it {
+                  is_expected.to contain_yumrepo('crb').with(
+                    'mirrorlist' => 'http://mirrorlist.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever',
+                    'descr' => "#{facts[:operatingsystem]} Linux $releasever - CRB",
+                  )
+                }
+              else
+                it {
+                  is_expected.to contain_yumrepo('crb').with(
+                    'mirrorlist' => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=CRB&infra=$infra',
+                    'descr' => "#{facts[:operatingsystem]} Linux $releasever - CRB",
+                  )
+                }
+              end
             end
             it { is_expected.to contain_yumrepo('powerdns') }
             it { is_expected.to contain_yumrepo('powerdns').with('baseurl' => 'http://repo.powerdns.com/centos/$basearch/$releasever/auth-48') }
@@ -154,6 +178,14 @@
           it { is_expected.to contain_service('pdns').with('enable' => 'true') }
           it { is_expected.to contain_service('pdns').with('name' => authoritative_service_name) }
           it { is_expected.to contain_service('pdns').that_requires("Package[#{authoritative_package_name}]") }
+          it 'creates the pdns.conf file' do
+            is_expected.to contain_file(authoritative_config).with(
+              ensure: 'file',
+              owner: 'root',
+              group: 'pdns',
+              mode: '0640',
+            ).that_comes_before('Service[pdns]')
+          end
         end
 
         context 'powerdns class with epel' do