diff options
| author | crupest <crupest@outlook.com> | 2022-11-25 14:15:33 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-11-25 14:15:33 +0800 |
| commit | 75ebe116cda3efe5d6847669fa6ec08434fbc416 (patch) | |
| tree | a9217312b53ae963a0198ec870c9855fbbd3f20c | |
| parent | 4d0425a017dd1d9436cef21bea2643f9e3da55aa (diff) | |
| download | crupest-75ebe116cda3efe5d6847669fa6ec08434fbc416.tar.gz crupest-75ebe116cda3efe5d6847669fa6ec08434fbc416.tar.bz2 crupest-75ebe116cda3efe5d6847669fa6ec08434fbc416.zip | |
Fix auto-certbot.
| -rw-r--r-- | docker/auto-certbot/Dockerfile | 1 | ||||
| -rwxr-xr-x | docker/auto-certbot/daemon.bash | 2 | ||||
| -rwxr-xr-x | tool/aio.py | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docker/auto-certbot/Dockerfile b/docker/auto-certbot/Dockerfile index 5310786..de6191c 100644 --- a/docker/auto-certbot/Dockerfile +++ b/docker/auto-certbot/Dockerfile @@ -14,6 +14,7 @@ ENV CRUPEST_ADDITIONAL_DOMAIN_LIST=${CRUPEST_ADDITIONAL_DOMAIN_LIST} ENV CRUPEST_EMAIL=${CRUPEST_EMAIL} ENV CRUPEST_AUTO_CERTBOT_POST_HOOK=${CRUPEST_AUTO_CERTBOT_POST_HOOK} COPY daemon.bash /daemon.bash +COPY get-cert-domains.py /get-cert-domains.py VOLUME ["/var/www/certbot", "/etc/letsencrypt", "/var/lib/letsencrypt"] ENTRYPOINT ["/sbin/tini", "--"] CMD [ "/daemon.bash" ] diff --git a/docker/auto-certbot/daemon.bash b/docker/auto-certbot/daemon.bash index 8ec78c0..fcdd92f 100755 --- a/docker/auto-certbot/daemon.bash +++ b/docker/auto-certbot/daemon.bash @@ -45,7 +45,7 @@ else printf "CRUPEST_AUTO_CERTBOT_RENEW_COMMAND is defined as:\n%s\n" "$CRUPEST_AUTO_CERTBOT_RENEW_COMMAND" fi -mapfile -t domains <<< "$(./get-cert-domains.py "${CRUPEST_CERT_PATH}")" +mapfile -t domains <<< "$(/get-cert-domains.py "${CRUPEST_CERT_PATH}")" for domain in "${domains[@]}"; do domain_options=("${domain_options[@]}" -d "$domain") diff --git a/tool/aio.py b/tool/aio.py index b238735..8ccaab9 100755 --- a/tool/aio.py +++ b/tool/aio.py @@ -272,9 +272,9 @@ class ConfigVar: config_var_list: list = [ ConfigVar("CRUPEST_DOMAIN", "domain name", - "Please input your domain name:"), + "Please input your domain name"), ConfigVar("CRUPEST_EMAIL", "admin email address", - "Please input your email address:"), + "Please input your email address"), ConfigVar("CRUPEST_USER", "your system account username", lambda: pwd.getpwuid(os.getuid()).pw_name), ConfigVar("CRUPEST_GROUP", "your system account group name", |