From 1a880a5613cff5488c09e8114bd855c6120a1a31 Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <quic_kralph@quicinc.com>
Date: Mon, 18 Dec 2023 12:48:21 -0800
Subject: [PATCH 1/2] delete Suse hiera data

Suse support was dropped from metadata.json in #292 commit
77ea67b22f2ef24920ec56f01e2658770a0a3b9d due to lack of working tests.
---
 data/os/Suse.yaml | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 data/os/Suse.yaml

diff --git a/data/os/Suse.yaml b/data/os/Suse.yaml
deleted file mode 100644
index c8414c31..00000000
--- a/data/os/Suse.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-puppetboard::apache_confd: '/etc/apache2/conf.d'
-puppetboard::apache_service: 'apache2'

From 5f70059dea68bd55ca8af865eda6666fb3386c2b Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <quic_kralph@quicinc.com>
Date: Mon, 18 Dec 2023 12:51:14 -0800
Subject: [PATCH 2/2] metadata.json: Add EL 9 (CentOS, Alma, Rocky, Oracle)
 support

This also adjusts hiera.yaml to reduce the amount of data that need to
be duplicated. This hiera.yaml is now effectively the same as the
hiera.yaml used by default with PDK: https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot_init/hiera.yaml.erb
---
 data/os/CentOS.7.yaml |  1 -
 data/os/CentOS.8.yaml |  1 -
 hiera.yaml            |  8 ++++++--
 metadata.json         | 24 ++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)
 delete mode 100644 data/os/CentOS.7.yaml
 delete mode 100644 data/os/CentOS.8.yaml

diff --git a/data/os/CentOS.7.yaml b/data/os/CentOS.7.yaml
deleted file mode 100644
index 72b8ec12..00000000
--- a/data/os/CentOS.7.yaml
+++ /dev/null
@@ -1 +0,0 @@
-puppetboard::python_version: '3.6'
diff --git a/data/os/CentOS.8.yaml b/data/os/CentOS.8.yaml
deleted file mode 100644
index 9a5756d6..00000000
--- a/data/os/CentOS.8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-puppetboard::python_version: '3.8'
diff --git a/hiera.yaml b/hiera.yaml
index 4a1d5610..34767c66 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -5,6 +5,10 @@ defaults:
   data_hash: 'yaml_data'
 hierarchy:
   - name: 'Distribution name and major version'
-    path: "os/%{facts.os.name}.%{facts.os.release.major}.yaml"
+    paths:
+      - "os/%{facts.os.name}.%{facts.os.release.major}.yaml"
+      - "os/%{facts.os.family}.%{facts.os.release.major}.yaml"
   - name: 'Distribution family'
-    path: "os/%{facts.os.family}.yaml"
+    paths:
+      - "os/%{facts.os.name}.yaml"
+      - "os/%{facts.os.family}.yaml"
diff --git a/metadata.json b/metadata.json
index a2a9eafe..73187dcd 100644
--- a/metadata.json
+++ b/metadata.json
@@ -13,6 +13,18 @@
   ],
   "issues_url": "https://github.com/voxpupuli/puppet-puppetboard/issues",
   "operatingsystem_support": [
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "9"
+      ]
+    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
@@ -27,6 +39,18 @@
         "13"
       ]
     },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "9"
+      ]
+    },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [