From dad2606dbd6166f4f330eae68bbfb1755fe51156 Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <kenyon@kenyonralph.com>
Date: Thu, 12 Oct 2023 22:38:47 -0700
Subject: [PATCH 1/3] plugins: avoid circular dependencies

`include` the letsencrypt class instead of `require` it.

Fixes #331.
---
 manifests/plugin/dns_cloudflare.pp | 2 +-
 manifests/plugin/dns_rfc2136.pp    | 2 +-
 manifests/plugin/dns_route53.pp    | 2 +-
 manifests/plugin/nginx.pp          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/plugin/dns_cloudflare.pp b/manifests/plugin/dns_cloudflare.pp
index f5f7d694..488a5714 100644
--- a/manifests/plugin/dns_cloudflare.pp
+++ b/manifests/plugin/dns_cloudflare.pp
@@ -23,7 +23,7 @@
   Boolean $manage_package           = true,
   Integer $propagation_seconds      = 10,
 ) {
-  require letsencrypt
+  include letsencrypt
 
   if ! $api_key and ! $api_token {
     fail('No authentication method provided, please specify either api_token or api_key and api_email.')
diff --git a/manifests/plugin/dns_rfc2136.pp b/manifests/plugin/dns_rfc2136.pp
index 5c358945..094c8f5b 100644
--- a/manifests/plugin/dns_rfc2136.pp
+++ b/manifests/plugin/dns_rfc2136.pp
@@ -24,7 +24,7 @@
   Stdlib::Absolutepath $config_dir = $letsencrypt::config_dir,
   Boolean $manage_package          = true,
 ) {
-  require letsencrypt
+  include letsencrypt
 
   if $manage_package {
     package { $package_name:
diff --git a/manifests/plugin/dns_route53.pp b/manifests/plugin/dns_route53.pp
index 09a59337..27a1ac9b 100644
--- a/manifests/plugin/dns_route53.pp
+++ b/manifests/plugin/dns_route53.pp
@@ -12,7 +12,7 @@
   Integer $propagation_seconds     = 10,
   Boolean $manage_package          = true,
 ) {
-  require letsencrypt
+  include letsencrypt
 
   if $manage_package {
     package { $package_name:
diff --git a/manifests/plugin/nginx.pp b/manifests/plugin/nginx.pp
index d63be1cc..a49f070d 100644
--- a/manifests/plugin/nginx.pp
+++ b/manifests/plugin/nginx.pp
@@ -6,7 +6,7 @@
   Boolean $manage_package = true,
   String[1] $package_name = 'python3-certbot-nginx',
 ) {
-  require letsencrypt
+  include letsencrypt
 
   if $manage_package {
     package { $package_name:

From c9a18e81fba6bc2a262bb8ab3d55bb0f9aa66b43 Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <kenyon@kenyonralph.com>
Date: Sun, 26 Nov 2023 14:44:34 -0800
Subject: [PATCH 2/3] plugin/dns_cloudflare: require EPEL for package if needed

---
 manifests/plugin/dns_cloudflare.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/manifests/plugin/dns_cloudflare.pp b/manifests/plugin/dns_cloudflare.pp
index 488a5714..a35d982c 100644
--- a/manifests/plugin/dns_cloudflare.pp
+++ b/manifests/plugin/dns_cloudflare.pp
@@ -34,8 +34,15 @@
       fail('No package name provided for certbot dns cloudflare plugin.')
     }
 
+    $requirement = if $letsencrypt::configure_epel {
+      Class['epel']
+    } else {
+      undef
+    }
+
     package { $package_name:
-      ensure => $letsencrypt::package_ensure,
+      ensure  => $letsencrypt::package_ensure,
+      require => $requirement,
     }
   }
 

From 75177bb600129e8aa93ec0230d3b409391b9565a Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <kenyon@kenyonralph.com>
Date: Sun, 26 Nov 2023 13:32:31 -0800
Subject: [PATCH 3/3] metadata.json: Update supported Fedora version from 36 to
 39

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index bff6c267..1911744a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -47,7 +47,7 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "36"
+        "39"
       ]
     },
     {