Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions data/os/CentOS/7.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions data/os/RedHat/7.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7",
"8",
"9"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"7",
"8",
"9"
]
Expand Down
7 changes: 1 addition & 6 deletions spec/classes/plugin/dns_cloudflare_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@ class { 'letsencrypt':
PUPPET
end
let(:package_name) do
osname = facts[:os]['name']
osrelease = facts[:os]['release']['major']
osfull = "#{osname}-#{osrelease}"
if %w[RedHat-7 CentOS-7].include?(osfull)
'python2-certbot-dns-cloudflare'
elsif %w[Debian RedHat].include?(facts[:os]['family'])
if %w[Debian RedHat].include?(facts[:os]['family'])
'python3-certbot-dns-cloudflare'
elsif %w[FreeBSD].include?(facts[:os]['family'])
'py39-certbot-dns-cloudflare'
Expand Down
11 changes: 3 additions & 8 deletions spec/classes/plugin/dns_rfc2136_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,10 @@ class { 'letsencrypt':
PUPPET
end
let(:package_name) do
osname = facts[:os]['name']
osrelease = facts[:os]['release']['major']
osfull = "#{osname}-#{osrelease}"
case osfull
when 'RedHat-7', 'CentOS-7'
'python2-certbot-dns-rfc2136'
when 'FreeBSD-12', 'FreeBSD-13'
case facts[:os]['family']
when 'FreeBSD'
'py39-certbot-dns-rfc2136'
when %r{OpenBSD}
when 'OpenBSD'
''
else
'python3-certbot-dns-rfc2136'
Expand Down
11 changes: 3 additions & 8 deletions spec/classes/plugin/dns_route53_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,10 @@ class { 'letsencrypt':
PUPPET
end
let(:package_name) do
osname = facts[:os]['name']
osrelease = facts[:os]['release']['major']
osfull = "#{osname}-#{osrelease}"
case osfull
when 'RedHat-7', 'CentOS-7'
'python2-certbot-dns-route53'
when 'FreeBSD-12', 'FreeBSD-13'
case facts[:os]['family']
when 'FreeBSD'
'py39-certbot-dns-route53'
when %r{OpenBSD}
when 'OpenBSD'
''
else
'python3-certbot-dns-route53'
Expand Down
6 changes: 1 addition & 5 deletions spec/classes/plugin/nginx_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ class { 'letsencrypt':
PUPPET
end
let(:package_name) do
if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
'python2-certbot-nginx'
else
'python3-certbot-nginx'
end
'python3-certbot-nginx'
end

context 'with default parameters' do
Expand Down