From 860ecae329f7c18b81b3e4cada67b5e530e9fdf9 Mon Sep 17 00:00:00 2001
From: Rick Paxton <rick.paxton@encore.tech>
Date: Thu, 15 Jul 2021 13:23:24 -0400
Subject: [PATCH 1/3] Add support for EL 8 appstream install

---
 README.md                        | 5 +++++
 manifests/database/postgresql.pp | 2 ++
 manifests/init.pp                | 2 ++
 manifests/params.pp              | 1 +
 4 files changed, 10 insertions(+)

diff --git a/README.md b/README.md
index c951e52c..cc1bb0ee 100644
--- a/README.md
+++ b/README.md
@@ -961,6 +961,11 @@ be installed from the regular repository. Defaults to `true`.
 If the postgresql.org repo is installed, you can install several versions of
 postgres. Defaults to `9.6` in module version 6.0+ and `9.4` in older versions.
 
+#### `manage_dnf_module`
+
+If `true`, enable specified postgresql version appstream for EL 8 systems. Also
+override $server_package_name within postgresql module.  Defaults to false.
+
 Implementation
 ---------------
 
diff --git a/manifests/database/postgresql.pp b/manifests/database/postgresql.pp
index 060fff31..f61aefd9 100644
--- a/manifests/database/postgresql.pp
+++ b/manifests/database/postgresql.pp
@@ -8,6 +8,7 @@
   $database_password           = $puppetdb::params::database_password,
   $database_port               = $puppetdb::params::database_port,
   $manage_database             = $puppetdb::params::manage_database,
+  $manage_dnf_module           = $puppetdb::params::manage_dnf_module,
   $manage_server               = $puppetdb::params::manage_dbserver,
   $manage_package_repo         = $puppetdb::params::manage_pg_repo,
   $postgres_version            = $puppetdb::params::postgres_version,
@@ -22,6 +23,7 @@
 
   if $manage_server {
     class { '::postgresql::globals':
+      manage_dnf_module   => $manage_dnf_module,
       manage_package_repo => $manage_package_repo,
       version             => $postgres_version,
     }
diff --git a/manifests/init.pp b/manifests/init.pp
index c999441d..65748e78 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -90,6 +90,7 @@
   String[1] $cleanup_timer_interval        = $puppetdb::params::cleanup_timer_interval,
   Integer[1] $dlo_max_age                  = $puppetdb::params::dlo_max_age,
   Optional[Stdlib::Absolutepath] $java_bin = $puppetdb::params::java_bin,
+  Boolean  $manage_dnf_module              = $puppetdb::params::manage_dnf_module
 ) inherits puppetdb::params {
 
   class { '::puppetdb::server':
@@ -192,6 +193,7 @@
       database_port               => $database_port,
       manage_server               => $manage_dbserver,
       manage_database             => $manage_database,
+      manage_dnf_module           => $manage_dnf_module,
       manage_package_repo         => $manage_package_repo,
       postgres_version            => $postgres_version,
       postgresql_ssl_on           => $postgresql_ssl_on,
diff --git a/manifests/params.pp b/manifests/params.pp
index fc9b6766..1a562504 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -18,6 +18,7 @@
   $database                  = $puppetdb::globals::database
   $manage_dbserver           = true
   $manage_database           = true
+  $manage_dnf_module         = false
 
   if $::osfamily =~ /RedHat|Debian/ {
     $manage_pg_repo            = true

From 7a091a0073fd6ac49e34eb3e1bd9c70e17c63c65 Mon Sep 17 00:00:00 2001
From: Rick Paxton <rick.paxton@encore.tech>
Date: Wed, 24 May 2023 19:50:22 -0400
Subject: [PATCH 2/3] Update metadata information

---
 metadata.json | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/metadata.json b/metadata.json
index d9272258..cb6a16f3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-puppetdb",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "author": "puppetlabs",
   "summary": "Installs PostgreSQL and PuppetDB, sets up the connection to Puppet master.",
   "license": "Apache-2.0",
@@ -10,15 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/inifile",
-      "version_requirement": ">= 1.1.3 < 6.0.0"
+      "version_requirement": ">= 1.1.3 < 7.0.0"
     },
     {
       "name": "puppetlabs/postgresql",
-      "version_requirement": ">= 6.5.0 < 9.0.0"
-    },
-    {
-      "name": "puppetlabs/firewall",
-      "version_requirement": ">= 1.1.3 < 4.0.0"
+      "version_requirement": ">= 6.5.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
@@ -29,7 +25,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
@@ -37,7 +32,6 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
@@ -45,7 +39,6 @@
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
@@ -53,7 +46,6 @@
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "6",
         "7"
       ]
     },
@@ -66,7 +58,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8",
         "9",
         "10",
         "11"

From 0f73b42378a122e93b13ce0e1faa5fcf20612fd9 Mon Sep 17 00:00:00 2001
From: Rick Paxton <rick.paxton@encore.tech>
Date: Wed, 14 Jun 2023 10:45:11 -0400
Subject: [PATCH 3/3] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7fb5b36..4062ccc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 Release notes for the puppetlabs-puppetdb module.
 
+#### 7.12.1 - 2023/05/20
+* Enable manage_dnf_module parameter for postgresql
+
 #### 7.12.0 - 2022/12/13
 * Grant read role to write user to fix database user permissions issue
   [PDB-5559](https://tickets.puppetlabs.com/browse/PDB-5559)