From 0a72c2fba78be82055360ad5945fc340bfe2375e Mon Sep 17 00:00:00 2001 From: missytake Date: Wed, 1 May 2024 00:21:58 +0200 Subject: [PATCH 1/4] acmetool: accept new terms of services closes #275 --- cmdeploy/src/cmdeploy/acmetool/response-file.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdeploy/src/cmdeploy/acmetool/response-file.yaml.j2 b/cmdeploy/src/cmdeploy/acmetool/response-file.yaml.j2 index 2e5ff23..ebfac3c 100644 --- a/cmdeploy/src/cmdeploy/acmetool/response-file.yaml.j2 +++ b/cmdeploy/src/cmdeploy/acmetool/response-file.yaml.j2 @@ -1,2 +1,2 @@ "acme-enter-email": "{{ email }}" -"acme-agreement:https://letsencrypt.org/documents/LE-SA-v1.3-September-21-2022.pdf": true +"acme-agreement:https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf": true From 7ce1a5e8416166d704bc64911682b395838ed741 Mon Sep 17 00:00:00 2001 From: missytake Date: Wed, 1 May 2024 00:41:11 +0200 Subject: [PATCH 2/4] ci: don't fail if /var/lib/acme isn't present --- .github/workflows/test-and-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-deploy.yaml b/.github/workflows/test-and-deploy.yaml index 6c0b445..b261d17 100644 --- a/.github/workflows/test-and-deploy.yaml +++ b/.github/workflows/test-and-deploy.yaml @@ -56,7 +56,7 @@ jobs: # restore acme & dkim state to staging.testrun.org rsync -avz acme-restore/acme/ root@staging.testrun.org:/var/lib/acme || true rsync -avz dkimkeys-restore/dkimkeys/ root@staging.testrun.org:/etc/dkimkeys || true - ssh -o StrictHostKeyChecking=accept-new -v root@staging.testrun.org chown root:root -R /var/lib/acme + ssh -o StrictHostKeyChecking=accept-new -v root@staging.testrun.org chown root:root -R /var/lib/acme || true - name: run formatting checks run: cmdeploy fmt -v From f35d98bb40d4c597d50e12807f1a4f30c101629e Mon Sep 17 00:00:00 2001 From: missytake Date: Wed, 1 May 2024 10:45:21 +0200 Subject: [PATCH 3/4] acmetool: enable debugging --- cmdeploy/src/cmdeploy/acmetool/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdeploy/src/cmdeploy/acmetool/__init__.py b/cmdeploy/src/cmdeploy/acmetool/__init__.py index ccf1178..2034a4f 100644 --- a/cmdeploy/src/cmdeploy/acmetool/__init__.py +++ b/cmdeploy/src/cmdeploy/acmetool/__init__.py @@ -71,5 +71,5 @@ def deploy_acmetool(email="", domains=[]): server.shell( name=f"Request certificate for: { ', '.join(domains) }", - commands=[f"acmetool want { ' '.join(domains)}"], + commands=[f"acmetool want --xlog.severity=debug { ' '.join(domains)}"], ) From e2cbf4e3e4f94c6ccc0bd6350ddb55c21661f32c Mon Sep 17 00:00:00 2001 From: missytake Date: Thu, 2 May 2024 13:48:38 +0200 Subject: [PATCH 4/4] changelog for #276 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39a0bec..cfc56af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## untagged +- Accept Let's Encrypt's new Terms of Services + ([#275](https://github.com/deltachat/chatmail/pull/276)) + - Reload Dovecot and Postfix when TLS certificate updates ([#271](https://github.com/deltachat/chatmail/pull/271))