Merge pull request #321 from martijndegouw/feature/propagepackageensu…

…retonginxplugin Propagate the package_ensure parameter to all plugins
voxpupuli · Jun 29, 2023 · 2dcc8a7 · 2dcc8a7
2 parents e4a3a1e + 2a9e467
commit 2dcc8a7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git 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::install
+  require letsencrypt
 
   if ! $api_key and ! $api_token {
     fail('No authentication method provided, please specify either api_token or api_key and api_email.')
@@ -35,7 +35,7 @@
     }
 
     package { $package_name:
-      ensure => installed,
+      ensure => $letsencrypt::package_ensure,
     }
   }
 

diff --git a/manifests/plugin/dns_rfc2136.pp b/manifests/plugin/dns_rfc2136.pp
@@ -28,7 +28,7 @@
 
   if $manage_package {
     package { $package_name:
-      ensure => installed,
+      ensure => $letsencrypt::package_ensure,
     }
   }
 

diff --git a/manifests/plugin/dns_route53.pp b/manifests/plugin/dns_route53.pp
@@ -16,7 +16,7 @@
 
   if $manage_package {
     package { $package_name:
-      ensure => installed,
+      ensure => $letsencrypt::package_ensure,
     }
   }
 }
diff --git a/manifests/plugin/nginx.pp b/manifests/plugin/nginx.pp
@@ -6,9 +6,11 @@
   Boolean $manage_package = true,
   String[1] $package_name = 'python3-certbot-nginx',
 ) {
+  require letsencrypt
+
   if $manage_package {
     package { $package_name:
-      ensure => installed,
+      ensure => $letsencrypt::package_ensure,
     }
   }
 }