From 415b8827101d6e473d8fb667b0426ea2a8731608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sat, 2 Oct 2021 18:08:51 -1000
Subject: [PATCH 1/3] Drop support for Debian 9, Ubuntu 16.04 and FreeBSD 11
 (EOL)

---
 metadata.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/metadata.json b/metadata.json
index 8211833f..be6f93a6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -35,7 +35,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04",
         "20.04"
       ]
@@ -43,7 +42,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9",
         "10"
       ]
     },
@@ -56,7 +54,6 @@
     {
       "operatingsystem": "FreeBSD",
       "operatingsystemrelease": [
-        "11",
         "12"
       ]
     }

From 342e4924a7c334aa4e5fe98a982e2031b64e51a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sat, 2 Oct 2021 18:12:42 -1000
Subject: [PATCH 2/3] Add support for Debian 11 and FreeBSD 13

---
 data/os/Debian/11.yaml                  | 3 +++
 metadata.json                           | 6 ++++--
 spec/classes/plugin/dns_rfc2136_spec.rb | 2 +-
 spec/classes/plugin/dns_route53_spec.rb | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 data/os/Debian/11.yaml

diff --git a/data/os/Debian/11.yaml b/data/os/Debian/11.yaml
new file mode 100644
index 00000000..d0641b25
--- /dev/null
+++ b/data/os/Debian/11.yaml
@@ -0,0 +1,3 @@
+---
+letsencrypt::plugin::dns_rfc2136::package_name: 'python3-certbot-dns-rfc2136'
+letsencrypt::plugin::dns_route53::package_name: 'python3-certbot-dns-route53'
diff --git a/metadata.json b/metadata.json
index be6f93a6..4128533e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -42,7 +42,8 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10"
+        "10",
+        "11"
       ]
     },
     {
@@ -54,7 +55,8 @@
     {
       "operatingsystem": "FreeBSD",
       "operatingsystemrelease": [
-        "12"
+        "12",
+        "13"
       ]
     }
   ],
diff --git a/spec/classes/plugin/dns_rfc2136_spec.rb b/spec/classes/plugin/dns_rfc2136_spec.rb
index 240d9aff..28885eea 100644
--- a/spec/classes/plugin/dns_rfc2136_spec.rb
+++ b/spec/classes/plugin/dns_rfc2136_spec.rb
@@ -17,7 +17,7 @@ class { 'letsencrypt':
         osrelease = facts[:os]['release']['major']
         osfull = "#{osname}-#{osrelease}"
         case osfull
-        when 'Debian-10', 'Ubuntu-20.04', 'Ubuntu-18.04', 'Fedora-30', 'Fedora-31'
+        when 'Debian-10', 'Debian-11', 'Ubuntu-20.04', 'Ubuntu-18.04', 'Fedora-30', 'Fedora-31'
           'python3-certbot-dns-rfc2136'
         when 'RedHat-7', 'CentOS-7'
           'python2-certbot-dns-rfc2136'
diff --git a/spec/classes/plugin/dns_route53_spec.rb b/spec/classes/plugin/dns_route53_spec.rb
index 84957a15..ec88d5da 100644
--- a/spec/classes/plugin/dns_route53_spec.rb
+++ b/spec/classes/plugin/dns_route53_spec.rb
@@ -17,7 +17,7 @@ class { 'letsencrypt':
         osrelease = facts[:os]['release']['major']
         osfull = "#{osname}-#{osrelease}"
         case osfull
-        when 'Debian-10', 'Ubuntu-20.04', 'Ubuntu-18.04', 'Fedora-30', 'Fedora-31'
+        when 'Debian-10', 'Debian-11', 'Ubuntu-20.04', 'Ubuntu-18.04', 'Fedora-30', 'Fedora-31'
           'python3-certbot-dns-route53'
         when 'RedHat-7', 'CentOS-7'
           'python2-certbot-dns-route53'

From 7434bea0c91e056835752b2dfde1a7c7953aa6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sat, 2 Oct 2021 18:22:38 -1000
Subject: [PATCH 3/3] Update FreeBSD package name

Python 2.7 has reached EOL.
---
 data/FreeBSD-family.yaml         | 2 +-
 spec/classes/letsencrypt_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/FreeBSD-family.yaml b/data/FreeBSD-family.yaml
index 5e7cf810..61e057ea 100644
--- a/data/FreeBSD-family.yaml
+++ b/data/FreeBSD-family.yaml
@@ -1,4 +1,4 @@
 ---
-letsencrypt::package_name: 'py27-certbot'
+letsencrypt::package_name: 'py38-certbot'
 letsencrypt::config_dir: '/usr/local/etc/letsencrypt'
 letsencrypt::cron_owner_group: 'wheel'
diff --git a/spec/classes/letsencrypt_spec.rb b/spec/classes/letsencrypt_spec.rb
index 1b591645..61425415 100644
--- a/spec/classes/letsencrypt_spec.rb
+++ b/spec/classes/letsencrypt_spec.rb
@@ -83,9 +83,9 @@
               is_expected.to contain_package('letsencrypt').with(name: 'certbot')
               is_expected.to contain_file('/etc/letsencrypt').with(ensure: 'directory')
             elsif facts[:operatingsystem] == 'FreeBSD'
-              is_expected.to contain_class('letsencrypt::install').with(package_name: 'py27-certbot')
+              is_expected.to contain_class('letsencrypt::install').with(package_name: 'py38-certbot')
               is_expected.to contain_class('letsencrypt').with(package_command: 'certbot')
-              is_expected.to contain_package('letsencrypt').with(name: 'py27-certbot')
+              is_expected.to contain_package('letsencrypt').with(name: 'py38-certbot')
               is_expected.to contain_file('/usr/local/etc/letsencrypt').with(ensure: 'directory')
             else
               is_expected.to contain_class('letsencrypt::install')