From aa64013bf9976d52ef8d0570de1d17b67ee33db5 Mon Sep 17 00:00:00 2001
From: Jake Spain <jakespain1@gmail.com>
Date: Thu, 7 Oct 2021 22:50:56 -0400
Subject: [PATCH] (#236) by Add support for RHEL 8 and AlmaLinux 8

---
 data/RedHat-family.yaml                 | 4 ++--
 data/os/CentOS/7.yaml                   | 3 +++
 data/os/RedHat/7.yaml                   | 3 +++
 metadata.json                           | 9 ++++++++-
 spec/classes/plugin/dns_rfc2136_spec.rb | 2 +-
 spec/classes/plugin/dns_route53_spec.rb | 2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 data/os/CentOS/7.yaml
 create mode 100644 data/os/RedHat/7.yaml

diff --git a/data/RedHat-family.yaml b/data/RedHat-family.yaml
index 404b411c..59fca34f 100644
--- a/data/RedHat-family.yaml
+++ b/data/RedHat-family.yaml
@@ -1,4 +1,4 @@
 ---
 letsencrypt::configure_epel: true
-letsencrypt::plugin::dns_rfc2136::package_name: 'python2-certbot-dns-rfc2136'
-letsencrypt::plugin::dns_route53::package_name: 'python2-certbot-dns-route53'
+letsencrypt::plugin::dns_rfc2136::package_name: 'python3-certbot-dns-rfc2136'
+letsencrypt::plugin::dns_route53::package_name: 'python3-certbot-dns-route53'
diff --git a/data/os/CentOS/7.yaml b/data/os/CentOS/7.yaml
new file mode 100644
index 00000000..e18cad3a
--- /dev/null
+++ b/data/os/CentOS/7.yaml
@@ -0,0 +1,3 @@
+---
+letsencrypt::plugin::dns_rfc2136::package_name: 'python2-certbot-dns-rfc2136'
+letsencrypt::plugin::dns_route53::package_name: 'python2-certbot-dns-route53'
diff --git a/data/os/RedHat/7.yaml b/data/os/RedHat/7.yaml
new file mode 100644
index 00000000..e18cad3a
--- /dev/null
+++ b/data/os/RedHat/7.yaml
@@ -0,0 +1,3 @@
+---
+letsencrypt::plugin::dns_rfc2136::package_name: 'python2-certbot-dns-rfc2136'
+letsencrypt::plugin::dns_route53::package_name: 'python2-certbot-dns-route53'
diff --git a/metadata.json b/metadata.json
index 4128533e..30deb9f5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -14,6 +14,12 @@
     "acme"
   ],
   "operatingsystem_support": [
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8"
+      ]
+    },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
@@ -23,7 +29,8 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {
diff --git a/spec/classes/plugin/dns_rfc2136_spec.rb b/spec/classes/plugin/dns_rfc2136_spec.rb
index 28885eea..dc2b9306 100644
--- a/spec/classes/plugin/dns_rfc2136_spec.rb
+++ b/spec/classes/plugin/dns_rfc2136_spec.rb
@@ -17,7 +17,7 @@ class { 'letsencrypt':
         osrelease = facts[:os]['release']['major']
         osfull = "#{osname}-#{osrelease}"
         case osfull
-        when 'Debian-10', 'Debian-11', 'Ubuntu-20.04', 'Ubuntu-18.04', 'Fedora-30', 'Fedora-31'
+        when 'Debian-10', 'Debian-11', 'AlmaLinux-8', 'RedHat-8', 'Ubuntu-20.04', 'Ubuntu-18.04', 'Fedora-30', 'Fedora-31'
           'python3-certbot-dns-rfc2136'
         when 'RedHat-7', 'CentOS-7'
           'python2-certbot-dns-rfc2136'
diff --git a/spec/classes/plugin/dns_route53_spec.rb b/spec/classes/plugin/dns_route53_spec.rb
index ec88d5da..91b77f91 100644
--- a/spec/classes/plugin/dns_route53_spec.rb
+++ b/spec/classes/plugin/dns_route53_spec.rb
@@ -17,7 +17,7 @@ class { 'letsencrypt':
         osrelease = facts[:os]['release']['major']
         osfull = "#{osname}-#{osrelease}"
         case osfull
-        when 'Debian-10', 'Debian-11', 'Ubuntu-20.04', 'Ubuntu-18.04', 'Fedora-30', 'Fedora-31'
+        when 'Debian-10', 'Debian-11', 'AlmaLinux-8', 'RedHat-8', 'Ubuntu-20.04', 'Ubuntu-18.04', 'Fedora-30', 'Fedora-31'
           'python3-certbot-dns-route53'
         when 'RedHat-7', 'CentOS-7'
           'python2-certbot-dns-route53'