diff options
| author | crupest <crupest@outlook.com> | 2022-11-25 14:20:44 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-11-25 14:20:44 +0800 |
| commit | 1534dcba89c244acbb830b77670c83b5d0e40a76 (patch) | |
| tree | 5c0a3c0adb4d223e967cb3d924bd1da8b70289e4 | |
| parent | 769362bdc5f5b608ca99ebc310f5fe3c33a5264a (diff) | |
| download | crupest-1534dcba89c244acbb830b77670c83b5d0e40a76.tar.gz crupest-1534dcba89c244acbb830b77670c83b5d0e40a76.tar.bz2 crupest-1534dcba89c244acbb830b77670c83b5d0e40a76.zip | |
Fix auto-certbot. v2.0
| -rwxr-xr-x | docker/auto-certbot/daemon.bash | 6 | ||||
| -rwxr-xr-x | docker/auto-certbot/get-cert-domains.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docker/auto-certbot/daemon.bash b/docker/auto-certbot/daemon.bash index bc60ca4..7e30a7d 100755 --- a/docker/auto-certbot/daemon.bash +++ b/docker/auto-certbot/daemon.bash @@ -45,7 +45,11 @@ 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}")" +domains_str="$(/get-cert-domains.py "${CRUPEST_CERT_PATH}")" + +printf "Domain list:\n%s\n" "$domains_str" + +mapfile -t domains <<< "$domains_str" for domain in "${domains[@]}"; do domain_options=("${domain_options[@]}" -d "$domain") diff --git a/docker/auto-certbot/get-cert-domains.py b/docker/auto-certbot/get-cert-domains.py index 3ba9462..9bd28c8 100755 --- a/docker/auto-certbot/get-cert-domains.py +++ b/docker/auto-certbot/get-cert-domains.py @@ -28,7 +28,7 @@ if not 'CRUPEST_DOMAIN' in os.environ: root_domain = os.environ['CRUPEST_DOMAIN'] -with open(cert_path) as f: +with open(cert_path, 'rb') as f: cert = load_pem_x509_certificate(f.read()) ext = cert.extensions.get_extension_for_oid( ExtensionOID.SUBJECT_ALTERNATIVE_NAME) |