From a1fd586dbd885e4267c77a949b5dc2d69aaeb308 Mon Sep 17 00:00:00 2001 From: Balakrishnan Balasubramanian Date: Wed, 20 Dec 2023 17:21:57 -0500 Subject: [PATCH] Add log in cert renew script --- Makefile | 6 ++++++ Pipfile.lock | 2 ++ deploy_configs/mail4one_cert_copy.sh | 5 ++--- requirements.txt | 8 ++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5c19b3b..e0594c0 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ clean: docker-tests: docker run --pull=always -v `pwd`:/app -w /app --rm python:3.11-alpine sh scripts/runtests.sh docker run --pull=always -v `pwd`:/app -w /app --rm python:3.10-alpine sh scripts/runtests.sh + docker run --pull=always -v `pwd`:/app -w /app --rm python:3.12 sh scripts/runtests.sh docker run --pull=always -v `pwd`:/app -w /app --rm python:3.11 sh scripts/runtests.sh docker run --pull=always -v `pwd`:/app -w /app --rm python:3.10 sh scripts/runtests.sh docker run --pull=always -v `pwd`:/app -w /app --rm python:3.9 sh scripts/runtests.sh @@ -38,6 +39,11 @@ setup: cleanup: pipenv --rm +update: + rm requirements.txt Pipfile.lock + pipenv update + pipenv requirements > requirements.txt + shell: MYPYPATH=`pipenv --venv`/lib/python3.11/site-packages pipenv shell diff --git a/Pipfile.lock b/Pipfile.lock index 64aded1..3d57926 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -22,6 +22,7 @@ "sha256:f9243b7dfe00aaf567da8728d891752426b51392174a34d2cf5c18053b63dcbc" ], "index": "pypi", + "markers": "python_version ~= '3.7'", "version": "==1.4.4.post2" }, "atpublic": { @@ -46,6 +47,7 @@ "sha256:ff4cd7ca75c9a8306b69ef6e878c296a5602f3279c6f9a82b6105b8eba764760" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==1.2" } }, diff --git a/deploy_configs/mail4one_cert_copy.sh b/deploy_configs/mail4one_cert_copy.sh index de263a4..bd44084 100755 --- a/deploy_configs/mail4one_cert_copy.sh +++ b/deploy_configs/mail4one_cert_copy.sh @@ -2,13 +2,11 @@ # certbot deploy hook to copy certificates to mail4one when renewed. # Initial setup, Install certbot(https://certbot.eff.org/) and run `certbot certonly` as root +# Doc: https://eff-certbot.readthedocs.io/en/latest/using.html#renewing-certificates # # This file is supposed to be copied to /etc/letsencrypt/renewal-hooks/deploy/ # Change the mail domain to the one on MX record -set -x - - if [ "$RENEWED_DOMAINS" = "mail.mydomain.com" ] then mkdir -p /var/lib/mail4one/certs @@ -17,4 +15,5 @@ then cp "$RENEWED_LINEAGE/fullchain.pem" /var/lib/mail4one/certs/ cp "$RENEWED_LINEAGE/privkey.pem" /var/lib/mail4one/certs/ systemctl restart mail4one.service + echo "$(date) Renewed and deployed certificates for mail4one" >> /var/log/mail4one-cert-renew.log fi diff --git a/requirements.txt b/requirements.txt index 068384e..6c908e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -i https://pypi.org/simple -aiosmtpd==1.4.4.post2 -atpublic==4.0 ; python_version >= '3.8' -attrs==23.1.0 ; python_version >= '3.7' -python-jata==1.2 +aiosmtpd==1.4.4.post2; python_version ~= '3.7' +atpublic==4.0; python_version >= '3.8' +attrs==23.1.0; python_version >= '3.7' +python-jata==1.2; python_version >= '3.8'