Merge pull request #356 from ekohl/drop-el7

Drop EL7 support
voxpupuli · Sep 9, 2024 · 30cc0fd · 30cc0fd
2 parents 875c0ed + cd1d6e7
commit 30cc0fd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 39 deletions.
diff --git a/data/os/CentOS/7.yaml b/data/os/CentOS/7.yaml
diff --git a/data/os/RedHat/7.yaml b/data/os/RedHat/7.yaml
diff --git a/metadata.json b/metadata.json
@@ -24,15 +24,13 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]

diff --git a/spec/classes/plugin/dns_cloudflare_spec.rb b/spec/classes/plugin/dns_cloudflare_spec.rb
@@ -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'

diff --git a/spec/classes/plugin/dns_rfc2136_spec.rb b/spec/classes/plugin/dns_rfc2136_spec.rb
@@ -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'

diff --git a/spec/classes/plugin/dns_route53_spec.rb b/spec/classes/plugin/dns_route53_spec.rb
@@ -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'

diff --git a/spec/classes/plugin/nginx_spec.rb b/spec/classes/plugin/nginx_spec.rb
@@ -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