From dc48edc0f420dc763740994a98b05ccd8939592c Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sat, 5 Jan 2019 11:18:43 +0100
Subject: [PATCH 1/2] Update for certbot.

---
 README   | 10 +++++-----
 setup.py |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 35d9a67..96c4057 100644
--- a/README
+++ b/README
@@ -5,19 +5,19 @@ This is a Let's Encrypt installer module for hitch. It is currently
 
 To use, assuming you've installed the Varnish authentication plugin:
 
- 1. Install letsencrypt as usual, with letsencrypt-auto.
+ 1. Install certbot as usual.
 
- 2. Activate the venv:
+ 2. Activate the venv, if installed in a venv:
 
-    . ~/.local/share/letsencrypt/bin/activate
+    . ~/.local/share/certbot/bin/activate
 
  3. Install the module:
 
-    pip install -e path/to/this/letsencrypt-hitch
+    pip3 install -e path/to/this/certbot-hitch
 
  4. Ask for and install a certificate:
 
-    sudo ~/.local/share/letsencrypt/bin/letsencrypt --agree-dev-preview --server https://acme-v01.api.letsencrypt.org/directory -a letsencrypt-varnish-plugin:varnish -i letsencrypt-hitch-plugin:hitch -d <domain>
+    sudo certbot -a certbot-varnish:varnish -i certbot-hitch:hitch -d <domain>
 
 
 The Hitch installer plugin is licensed under the same terms as the Let's
diff --git a/setup.py b/setup.py
index bbe3859..3e81609 100644
--- a/setup.py
+++ b/setup.py
@@ -2,14 +2,14 @@ from setuptools import setup
 
 
 setup(
-    name='letsencrypt-hitch-plugin',
+    name='certbot-hitch',
     package='hitch.py',
     install_requires=[
-        'letsencrypt',
+        'certbot>=0.26.0',
         'zope.interface',
     ],
     entry_points={
-        'letsencrypt.plugins': [
+        'certbot.plugins': [
             'hitch = hitch:Installer',
         ],
     },
-- 
2.39.2


From 0fd0d4a231d6fb69dee84db31ddd124c97ca4e45 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sun, 16 Apr 2023 13:10:17 +0200
Subject: [PATCH 2/2] Small update for certbot in bookworm.

---
 hitch.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/hitch.py b/hitch.py
index 537e02c..edcaedd 100644
--- a/hitch.py
+++ b/hitch.py
@@ -4,13 +4,11 @@ import os
 import re
 import subprocess
 
-import zope.component
-
 from zope.interface import implementer, provider
 
-from letsencrypt import errors
-from letsencrypt import interfaces
-from letsencrypt.plugins import common
+from certbot import errors
+from certbot import interfaces
+from certbot.plugins import common
 
 
 logger = logging.getLogger(__name__)
@@ -34,6 +32,10 @@ class Installer(common.Plugin):
     def get_all_names(self):
         raise errors.PluginError("not implemented")
 
+    @classmethod
+    def add_parser_arguments(cls, add):
+        pass
+
     def deploy_cert(self, domain, cert_path, key_path,
                     chain_path=None, fullchain_path=None):
         # Concatenate private key and certificate together into one file.
-- 
2.39.2