From 95c145b12c91909e4ff02dc42eeb93ac18327d06 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sat, 29 Apr 2017 23:35:01 +0200 Subject: [PATCH] Bugfix letsencrypt (#8) --- letsencrypt/config.json | 2 +- letsencrypt/run.sh | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/letsencrypt/config.json b/letsencrypt/config.json index 9c44399..8dea4dc 100644 --- a/letsencrypt/config.json +++ b/letsencrypt/config.json @@ -1,6 +1,6 @@ { "name": "Let's Encrypt", - "version": "0.1", + "version": "0.2", "slug": "letsencrypt", "description": "Manage let's encrypt certificate", "startup": "once", diff --git a/letsencrypt/run.sh b/letsencrypt/run.sh index 05c3744..801c6ed 100644 --- a/letsencrypt/run.sh +++ b/letsencrypt/run.sh @@ -1,5 +1,4 @@ #!/bin/bash - set -e CERT_DIR=/data/letsencrypt @@ -23,17 +22,17 @@ if [ -d $CERT_DIR ]; then /data/certbot-auto renew --non-interactive --config-dir $CERT_DIR --work-dir $WORK_DIR else # generate domains - while IFS=$'\n' read -r line; do + for line in $DOMAINS; do if [ -z "$DOMAIN_ARG" ]; then DOMAIN_ARG="-d $line" else DOMAIN_ARG="$DOMAIN_ARG -d $line" fi - done <<< "$DOMAINS" + done - /data/certbot-auto certonly --non-interactive --standalone --email $EMAIL --config-dir $CERT_DIR --work-dir "$DOMAIN_ARG" + /data/certbot-auto certonly --non-interactive --standalone --email "$EMAIL" --config-dir $CERT_DIR --work-dir "$DOMAIN_ARG" fi # copy certs to store -cp /data/letsencrypt/live/*/privkey.pem /ssl/KEYFILE -cp /data/letsencrypt/live/*/fullchain.pem /ssl/CERTFILE +cp /data/letsencrypt/live/*/privkey.pem "/ssl/$KEYFILE" +cp /data/letsencrypt/live/*/fullchain.pem "/ssl/$CERTFILE"