From c12f443c15002f2b2dccd1818711079620482c49 Mon Sep 17 00:00:00 2001 From: Alex Zorin Date: Wed, 23 Nov 2022 07:16:45 +1100 Subject: [PATCH 1/3] remove zope to fix compatibility with Certbot 2.x --- certbot_dns_ionos/dns_ionos.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/certbot_dns_ionos/dns_ionos.py b/certbot_dns_ionos/dns_ionos.py index 8b09b22..697bb68 100644 --- a/certbot_dns_ionos/dns_ionos.py +++ b/certbot_dns_ionos/dns_ionos.py @@ -1,20 +1,15 @@ """DNS Authenticator for IONOS.""" import json import logging -import time import requests -import zope.interface from certbot import errors -from certbot import interfaces from certbot.plugins import dns_common logger = logging.getLogger(__name__) -@zope.interface.implementer(interfaces.IAuthenticator) -@zope.interface.provider(interfaces.IPluginFactory) class Authenticator(dns_common.DNSAuthenticator): """DNS Authenticator for IONOS From 2ab6e04cffa2f59822d1657f337548319a95e25c Mon Sep 17 00:00:00 2001 From: helgeerbe Date: Thu, 24 Nov 2022 13:25:35 +0100 Subject: [PATCH 2/3] change test environment --- .vscode/launch.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index eaec02c..1bef1a4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,9 +8,9 @@ "name": "Python: Current File", "type": "python", "request": "launch", - "program": "/home/pi/dev/certbot/venv3/bin/certbot", + "program": ".venv/bin/certbot", "console": "integratedTerminal", - "args": ["certonly", "-a", "dns-ionos", "-d", "*.erbehome.de", "--dns-ionos-credentials", "/home/pi/dev/certbot-dns-ionos/my_debug/secrets/credentials.ini", "--config-dir", "my_debug/config", "--work-dir", "my_debug/work", "--logs-dir", "my_debug/logs"] + "args": ["certonly", "-a", "dns-ionos", "-d", "*.erbehome.de", "-d", "erbehome.de", "--dns-ionos-credentials", "my_debug/secrets/credentials.ini", "--config-dir", "my_debug/config", "--work-dir", "my_debug/work", "--logs-dir", "my_debug/logs"] } ] } \ No newline at end of file From 43b053ef22fc94243336249dd6b590502de8b81b Mon Sep 17 00:00:00 2001 From: helgeerbe Date: Thu, 24 Nov 2022 14:38:19 +0100 Subject: [PATCH 3/3] Make plugin compliant for certbot 2.x --- README.rst | 6 ++++++ setup.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index e5cdd98..6c7cf42 100644 --- a/README.rst +++ b/README.rst @@ -135,6 +135,12 @@ chmod 700 /etc/letsencrypt/.secrets Changelog ========= +- 2022.11.24 + - remove zope to fix compatibility with Certbot 2.x (Fixes #19) + As a reminder, Certbot will default to issuing ECDSA certificates from release 2.0.0. + If you update from a prior certbot release, run the plugin once manually. You will be prompted + to update RSA key type to ECDSA. + - 2022.05.15 - Added capability to handle multiple domain validations #16 diff --git a/setup.py b/setup.py index 14ebd6a..1b98d63 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,11 @@ from setuptools import setup from setuptools import find_packages -version = "2022.05.15" +version = "2022.11.24" install_requires = [ "acme>=1.8.0", - "certbot>=0.31.0", + "certbot>=2.0.0", "setuptools", "requests", "mock",