Skip to content

Commit 4abfbaa

Browse files
authored
Handle double quotes in config, fixes eugene-khyst#13
1 parent d102ab1 commit 4abfbaa

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

certbot/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM certbot/certbot:v1.27.0
1+
FROM certbot/certbot:v1.29.0
22

33
RUN apk add --no-cache bash
44

certbot/certbot.sh

+11-7
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ if [ "$CERTBOT_TEST_CERT" != "0" ]; then
1818
test_cert_arg="--test-cert"
1919
fi
2020

21-
domain_list=($DOMAINS)
22-
emails_list=($CERTBOT_EMAILS)
21+
domains_fixed=$(echo "$DOMAINS" | tr -d \")
22+
domain_list=($domains_fixed)
23+
emails_fixed=$(echo "$CERTBOT_EMAILS" | tr -d \")
24+
emails_list=($emails_fixed)
2325
for i in "${!domain_list[@]}"; do
2426
domain="${domain_list[i]}"
2527

@@ -30,12 +32,13 @@ for i in "${!domain_list[@]}"; do
3032
continue
3133
fi
3234

33-
echo "Obtaining the certificate for $domain"
34-
35-
if [ -z "${emails_list[i]}" ]; then
35+
email="${emails_list[i]}"
36+
if [ -z "$email" ]; then
3637
email_arg="--register-unsafely-without-email"
38+
echo "Obtaining the certificate for $domain without email"
3739
else
38-
email_arg="--email ${emails_list[i]}"
40+
email_arg="--email $email"
41+
echo "Obtaining the certificate for $domain with email $email"
3942
fi
4043

4144
certbot certonly \
@@ -46,5 +49,6 @@ for i in "${!domain_list[@]}"; do
4649
$email_arg \
4750
--rsa-key-size "${CERTBOT_RSA_KEY_SIZE:-4096}" \
4851
--agree-tos \
49-
--noninteractive || true
52+
--noninteractive \
53+
--verbose || true
5054
done

cron/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.15
1+
FROM alpine:3.16
22

33
RUN apk update && \
44
apk add --no-cache docker-cli docker-cli-compose

nginx/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginx:1.21-alpine
1+
FROM nginx:1.23-alpine
22

33
RUN apk add --no-cache openssl
44

nginx/nginx.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ if [ ! -f /etc/nginx/sites/ssl/ssl-dhparams.pem ]; then
4040
openssl dhparam -out /etc/nginx/sites/ssl/ssl-dhparams.pem 2048
4141
fi
4242

43-
for domain in $DOMAINS; do
43+
domains_fixed=$(echo "$DOMAINS" | tr -d \")
44+
for domain in $domains_fixed; do
4445
echo "Checking configuration for $domain"
4546

4647
if [ ! -f "/etc/nginx/sites/$domain.conf" ]; then

0 commit comments

Comments
 (0)