From 2a9e467d72d8d9fc49537a1252f13091c1a59015 Mon Sep 17 00:00:00 2001 From: Martijn de Gouw Date: Thu, 22 Jun 2023 21:04:46 +0200 Subject: [PATCH] Propagate the package_ensure parameter to all plugins --- manifests/plugin/dns_cloudflare.pp | 4 ++-- manifests/plugin/dns_rfc2136.pp | 2 +- manifests/plugin/dns_route53.pp | 2 +- manifests/plugin/nginx.pp | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/manifests/plugin/dns_cloudflare.pp b/manifests/plugin/dns_cloudflare.pp index 41db03ec..f5f7d694 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::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 index 217b1b94..5c358945 100644 --- 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 index 3d3d27b3..09a59337 100644 --- 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 index 66e1c3b6..d63be1cc 100644 --- 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, } } }