From bc35d86946eb7d36f75c60da936bdc52958ef122 Mon Sep 17 00:00:00 2001 From: Elliot Schleglemilch Date: Thu, 11 Jul 2024 21:07:39 +0000 Subject: [PATCH 1/2] Update FreeBSD package names to the Python 3.11 version. This was changed in the ports tree on May 29, commit 62a23ef0936e21fef507653054d6732bb7ef085f --- data/FreeBSD-family.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/FreeBSD-family.yaml b/data/FreeBSD-family.yaml index ba1ac097..46a0d2e7 100644 --- a/data/FreeBSD-family.yaml +++ b/data/FreeBSD-family.yaml @@ -1,7 +1,7 @@ --- -letsencrypt::package_name: 'py39-certbot' +letsencrypt::package_name: 'py311-certbot' letsencrypt::config_dir: '/usr/local/etc/letsencrypt' letsencrypt::cron_owner_group: 'wheel' -letsencrypt::plugin::dns_rfc2136::package_name: 'py39-certbot-dns-rfc2136' -letsencrypt::plugin::dns_route53::package_name: 'py39-certbot-dns-route53' -letsencrypt::plugin::dns_cloudflare::package_name: 'py39-certbot-dns-cloudflare' +letsencrypt::plugin::dns_rfc2136::package_name: 'py311-certbot-dns-rfc2136' +letsencrypt::plugin::dns_route53::package_name: 'py311-certbot-dns-route53' +letsencrypt::plugin::dns_cloudflare::package_name: 'py311-certbot-dns-cloudflare' From 3c3a4f472cd7e5d11364f89f0dd8f84676819d3d Mon Sep 17 00:00:00 2001 From: Elliot Schleglemilch Date: Thu, 11 Jul 2024 21:10:59 +0000 Subject: [PATCH 2/2] also update versions in tests. --- spec/classes/letsencrypt_spec.rb | 4 ++-- spec/classes/plugin/dns_cloudflare_spec.rb | 2 +- spec/classes/plugin/dns_rfc2136_spec.rb | 2 +- spec/classes/plugin/dns_route53_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/classes/letsencrypt_spec.rb b/spec/classes/letsencrypt_spec.rb index 1abe1252..b26fee8a 100644 --- a/spec/classes/letsencrypt_spec.rb +++ b/spec/classes/letsencrypt_spec.rb @@ -74,9 +74,9 @@ is_expected.to contain_package('letsencrypt').with(name: 'certbot').with_ensure('installed') is_expected.to contain_file('/etc/letsencrypt').with(ensure: 'directory') elsif facts[:operatingsystem] == 'FreeBSD' - is_expected.to contain_class('letsencrypt::install').with(package_name: 'py39-certbot') + is_expected.to contain_class('letsencrypt::install').with(package_name: 'py311-certbot') is_expected.to contain_class('letsencrypt').with(package_command: 'certbot') - is_expected.to contain_package('letsencrypt').with(name: 'py39-certbot').with_ensure('installed') + is_expected.to contain_package('letsencrypt').with(name: 'py311-certbot').with_ensure('installed') is_expected.to contain_file('/usr/local/etc/letsencrypt').with(ensure: 'directory') else is_expected.to contain_class('letsencrypt::install') diff --git a/spec/classes/plugin/dns_cloudflare_spec.rb b/spec/classes/plugin/dns_cloudflare_spec.rb index bfe4cf1c..29e87f05 100644 --- a/spec/classes/plugin/dns_cloudflare_spec.rb +++ b/spec/classes/plugin/dns_cloudflare_spec.rb @@ -18,7 +18,7 @@ class { 'letsencrypt': if %w[Debian RedHat].include?(facts[:os]['family']) 'python3-certbot-dns-cloudflare' elsif %w[FreeBSD].include?(facts[:os]['family']) - 'py39-certbot-dns-cloudflare' + 'py311-certbot-dns-cloudflare' end end diff --git a/spec/classes/plugin/dns_rfc2136_spec.rb b/spec/classes/plugin/dns_rfc2136_spec.rb index e9e7ddfe..8e7ab96a 100644 --- a/spec/classes/plugin/dns_rfc2136_spec.rb +++ b/spec/classes/plugin/dns_rfc2136_spec.rb @@ -17,7 +17,7 @@ class { 'letsencrypt': let(:package_name) do case facts[:os]['family'] when 'FreeBSD' - 'py39-certbot-dns-rfc2136' + 'py311-certbot-dns-rfc2136' when 'OpenBSD' '' else diff --git a/spec/classes/plugin/dns_route53_spec.rb b/spec/classes/plugin/dns_route53_spec.rb index 89beef5d..ab218dc9 100644 --- a/spec/classes/plugin/dns_route53_spec.rb +++ b/spec/classes/plugin/dns_route53_spec.rb @@ -17,7 +17,7 @@ class { 'letsencrypt': let(:package_name) do case facts[:os]['family'] when 'FreeBSD' - 'py39-certbot-dns-route53' + 'py311-certbot-dns-route53' when 'OpenBSD' '' else