Small update for certbot in bookworm.

diff --git a/README b/README
index 35d9a67bba98acb48eeb20eff589f8d2bc8f57bd..96c4057d283948fdaa9052b8db98d1abefd3f5f4 100644 (file)
--- 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:
 
 
 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:
 
 
  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:
 
 
  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
 
 
 The Hitch installer plugin is licensed under the same terms as the Let's

diff --git a/hitch.py b/hitch.py
index 537e02cae7e180e3aacf7ad1136ed1f6593a6110..edcaedda7a9885994121a5741607a30f7aa06eeb 100644 (file)
--- a/hitch.py
+++ b/hitch.py
@@ -4,13 +4,11 @@ import os
 import re
 import subprocess
 
 import re
 import subprocess
 

-import zope.component
-

 from zope.interface import implementer, provider
 
 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__)
 
 
 logger = logging.getLogger(__name__)


@@ -34,6 +32,10 @@ class Installer(common.Plugin):
     def get_all_names(self):
         raise errors.PluginError("not implemented")
 
     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.
     def deploy_cert(self, domain, cert_path, key_path,
                     chain_path=None, fullchain_path=None):
         # Concatenate private key and certificate together into one file.

diff --git a/setup.py b/setup.py
index bbe38591873feaaf7f38d3f7a042d8358ae7f03f..3e81609b5f3774d5cc7afcbab943fbb4a7cef3ee 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,14 +2,14 @@ from setuptools import setup
 
 
 setup(
 
 
 setup(

-    name='letsencrypt-hitch-plugin',
+    name='certbot-hitch',

     package='hitch.py',
     install_requires=[
     package='hitch.py',
     install_requires=[

-        'letsencrypt',
+        'certbot>=0.26.0',

         'zope.interface',
     ],
     entry_points={
         'zope.interface',
     ],
     entry_points={

-        'letsencrypt.plugins': [
+        'certbot.plugins': [

             'hitch = hitch:Installer',
         ],
     },
             'hitch = hitch:Installer',
         ],
     },