From 7a17b2b90b17910b8c71fa3fed990b0cb7888bc6 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 21 May 2017 23:13:37 +0200 Subject: [PATCH] Fix multi domains (#76) --- letsencrypt/config.json | 2 +- letsencrypt/run.sh | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/letsencrypt/config.json b/letsencrypt/config.json index 4da4a3e..59bddb6 100644 --- a/letsencrypt/config.json +++ b/letsencrypt/config.json @@ -1,6 +1,6 @@ { "name": "Let's Encrypt", - "version": "0.6", + "version": "0.7", "slug": "letsencrypt", "description": "Manage Let's Encrypt certificate", "url": "https://home-assistant.io/addons/lets_encrypt/", diff --git a/letsencrypt/run.sh b/letsencrypt/run.sh index 8c47388..97a91ac 100644 --- a/letsencrypt/run.sh +++ b/letsencrypt/run.sh @@ -12,16 +12,13 @@ CERTFILE=$(jq --raw-output ".certfile" $CONFIG_PATH) # Generate new certs if [ ! -d "$CERT_DIR" ]; then + DOMAIN_ARR=() for line in $DOMAINS; do - if [ -z "$DOMAIN_ARG" ]; then - DOMAIN_ARG="-d $line" - else - DOMAIN_ARG="$DOMAIN_ARG -d $line" - fi + DOMAIN_ARR+=(-d "$line") done echo "$DOMAINS" > /data/domains.gen - certbot certonly --non-interactive --standalone --email "$EMAIL" --agree-tos --config-dir "$CERT_DIR" --work-dir "$WORK_DIR" "$DOMAIN_ARG" + certbot certonly --non-interactive --standalone --email "$EMAIL" --agree-tos --config-dir "$CERT_DIR" --work-dir "$WORK_DIR" "${DOMAIN_ARR[@]}" # Renew certs else