From e3d9cf4f02e0296ea7b454ac4c75e83d2754226d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 27 Oct 2021 23:15:17 +0200 Subject: [PATCH] Update 30-keygen --- nextcloud/root/etc/cont-init.d/30-keygen | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nextcloud/root/etc/cont-init.d/30-keygen b/nextcloud/root/etc/cont-init.d/30-keygen index 95b645251..6e458d2c8 100644 --- a/nextcloud/root/etc/cont-init.d/30-keygen +++ b/nextcloud/root/etc/cont-init.d/30-keygen @@ -23,15 +23,14 @@ fi #Sets certificates echo "... adding ssl certs in files" #Sets certificates - for NGINXFILE in "/defaults/default" "/config/nginx/site-confs/default" "/data/config/nginx/site-confs/default"; do - if [ -f $NGINXFILE ]; then - LINE=$(sed -n '/cert.crt/=' $NGINXFILE) && \ - sed -i "$LINE a ssl_certificate /ssl/${CERTFILE};" $NGINXFILE && \ + for NGINXFILE in "/defaults/default" "/config/nginx/site-confs/default" "/data/config/nginx/site-confs/default"; do + if [ -f $NGINXFILE ]; then + LINE=$(sed -n '/cert.crt/=' $NGINXFILE) + [ ! -z $LINE ] && sed -i "$LINE a ssl_certificate /ssl/${CERTFILE};" $NGINXFILE && \ sed -i "$LINE d" $NGINXFILE && \ - \ - LINE=$(sed -n '/cert.key/=' $NGINXFILE) && \ sed -i "$LINE a ssl_certificate_key /ssl/${KEYFILE};" $NGINXFILE && \ - sed -i "$LINE d" $NGINXFILE || true + sed -i "$LINE d" $NGINXFILE + echo $NGINXFILE fi done bashio::log.info "... done"