Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to work with certbot 2.8.0 (requires different command-line args) #95

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update to work with certbot 2.8.0 (requires different command-line args) #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
777483c
update to work with certbot 2.8.0 (requires different command-line args)
Jan 17, 2024
7e77a47
bump version to 0.4.3
jensbjorgensen Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ To generate a certificate and install it in a CloudFront distribution:
```bash
AWS_ACCESS_KEY_ID="REPLACE_WITH_YOUR_KEY" \
AWS_SECRET_ACCESS_KEY="REPLACE_WITH_YOUR_SECRET" \
certbot --agree-tos -a certbot-s3front:auth \
--certbot-s3front:auth-s3-bucket REPLACE_WITH_YOUR_BUCKET_NAME \
[ --certbot-s3front:auth-s3-region your-bucket-region-name ] #(the default is us-east-1, unless you want to set it to something else, you can delete this line) \
[ --certbot-s3front:auth-s3-directory your-bucket-directory ] # (default is "") \
-i certbot-s3front:installer \
--certbot-s3front:installer-cf-distribution-id REPLACE_WITH_YOUR_CF_DISTRIBUTION_ID \
certbot --agree-tos -a s3front_auth \
--s3front_auth-s3-bucket REPLACE_WITH_YOUR_BUCKET_NAME \
[ --s3front_auth-s3-region your-bucket-region-name ] #(the default is us-east-1, unless you want to set it to something else, you can delete this line) \
[ --s3front_auth-s3-directory your-bucket-directory ] # (default is "") \
-i s3front_installer \
--s3front_installer-cf-distribution-id REPLACE_WITH_YOUR_CF_DISTRIBUTION_ID \
-d REPLACE_WITH_YOUR_DOMAIN
```

Expand Down
2 changes: 1 addition & 1 deletion certbot_s3front/authenticator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

@zope.interface.implementer(interfaces.IAuthenticator)
@zope.interface.provider(interfaces.IPluginFactory)
class Authenticator(common.Plugin):
class Authenticator(common.Plugin, interfaces.Authenticator):
description = "S3/CloudFront Authenticator"

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion certbot_s3front/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

@zope.interface.implementer(interfaces.IInstaller)
@zope.interface.provider(interfaces.IPluginFactory)
class Installer(common.Plugin):
class Installer(common.Installer):
description = "S3/CloudFront Installer"

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

/usr/local/bin/certbot -n --init --agree-tos -a certbot-s3front:auth -i certbot-s3front:installer --certbot-s3front:auth-s3-bucket $AWS_S3_BUCKET --certbot-s3front:installer-cf-distribution-id $AWS_DISTRIBUTION_ID --email $EMAIL -d $DOMAIN
/usr/local/bin/certbot -n --init --agree-tos -a s3front_auth -i s3front_installer --s3front_auth-s3-bucket $AWS_S3_BUCKET --s3front_installer-cf-distribution-id $AWS_DISTRIBUTION_ID --email $EMAIL -d $DOMAIN
8 changes: 4 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
from distutils.core import setup
from setuptools import find_packages

version = '0.4.2'
version = '0.4.3'

install_requires = [
'acme>=0.1.1',
'certbot>=0.9.3',
'certbot>=2.8.0',
'PyOpenSSL',
'setuptools', # pkg_resources
'zope.interface',
Expand Down Expand Up @@ -55,8 +55,8 @@
keywords = ['certbot', 'cloudfront', 's3'],
entry_points={
'certbot.plugins': [
'auth = certbot_s3front.authenticator:Authenticator',
'installer = certbot_s3front.installer:Installer',
's3front_auth = certbot_s3front.authenticator:Authenticator',
's3front_installer = certbot_s3front.installer:Installer',
],
},
)