From 66b6cca78e3dfc4503521db220d95d8c8ffc42a2 Mon Sep 17 00:00:00 2001 From: Zoey Date: Thu, 6 Apr 2023 16:48:40 +0200 Subject: [PATCH] remove zope again and switch to other dnspod plugin --- Dockerfile | 2 +- global/certbot-dns-plugins.js | 8 ++++---- rootfs/bin/start.sh | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b6e5ec12..d61e89bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN apk add --no-cache ca-certificates tzdata \ coreutils grep jq curl \ build-base libffi-dev && \ # Install Certbot - pip install --no-cache-dir certbot zope && \ + pip install --no-cache-dir certbot && \ # Clean apk del --no-cache build-base libffi-dev diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index d5a8770b..819ebd25 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -165,10 +165,10 @@ dns_dnsmadeeasy_secret_key = c9b5625f-9834-4ff8-baba-4ed5f32cae55`, //####################################################// dnspod: { display_name: 'DNSPod', - package_name: 'certbot-dns-dnspod', - credentials: `dns_dnspod_email = "email@example.com" -dns_dnspod_api_token = "id,key"`, - full_plugin_name: 'dns-dnspod', + package_name: 'certbot-dnspod', + credentials: `certbot_dnspod_token = +certbot_dnspod_token_id = `, + full_plugin_name: 'certbot-dnspod', }, //####################################################// domainoffensive: { diff --git a/rootfs/bin/start.sh b/rootfs/bin/start.sh index ca5a0e05..d459c6ea 100755 --- a/rootfs/bin/start.sh +++ b/rootfs/bin/start.sh @@ -363,6 +363,9 @@ else /data/tls/dummykey.pem || sleep inf fi +chmod -R 600 /data/tls \ + /data/etc/access + if [ ! -f /data/nginx/default.conf ]; then mv -vn /usr/local/nginx/conf/conf.d/include/default.conf /data/nginx/default.conf || sleep inf fi