From 328f0804266caeb77b1c4e3244fcde9b82ed8c00 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 28 Oct 2021 09:31:16 +0200 Subject: [PATCH] Correct code --- nextcloud/root/etc/cont-init.d/30-keygen | 41 ++++++++++++------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/nextcloud/root/etc/cont-init.d/30-keygen b/nextcloud/root/etc/cont-init.d/30-keygen index d426b7508..dee562bd1 100644 --- a/nextcloud/root/etc/cont-init.d/30-keygen +++ b/nextcloud/root/etc/cont-init.d/30-keygen @@ -2,34 +2,35 @@ if bashio::config.true 'use_own_certs'; then - bashio::log.info "Using referenced ssl certificates..." - CERTFILE=$(bashio::config 'certfile') - KEYFILE=$(bashio::config 'keyfile') + bashio::log.info "Using referenced ssl certificates..." + CERTFILE=$(bashio::config 'certfile') + KEYFILE=$(bashio::config 'keyfile') - #Check if files exist - echo "... checking if referenced files exist" - [ ! -f /ssl/$CERTFILE ] && bashio::log.fatal "... Certificate /ssl/$CERTFILE not found" && exit 0 - [ ! -f /ssl/$KEYFILE ] && bashio::log.fatal "... Certificate /ssl/$KEYFILE not found" && exit 0 + #Check if files exist + echo "... checking if referenced files exist" + [ ! -f /ssl/$CERTFILE ] && bashio::log.fatal "... Certificate /ssl/$CERTFILE not found" && exit 0 + [ ! -f /ssl/$KEYFILE ] && bashio::log.fatal "... Certificate /ssl/$KEYFILE not found" && exit 0 else bashio::log.info "No ssl certificates set. Auto generating ones..." SUBJECT="/C=US/ST=CA/L=Carlsbad/O=Linuxserver.io/OU=LSIO Server/CN=*" openssl req -new -x509 -days 3650 -nodes -out /ssl/nextcloud/keys/cert.crt -keyout /ssl/nextcloud/keys/cert.key -subj "$SUBJECT" - CERTFILE="/ssl/nextcloud/keys/cert.crt" + CERTFILE="/ssl/nextcloud/keys/cert.crt" KEYFILE="/ssl/nextcloud/keys/cert.key" 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 "/ssl_certificate /=" $NGINXFILE) - if [ ! -z $LINE ]; then - sed -i "/ssl_certificate/ d" $NGINXFILE - sed -i "$LINE a ssl_certificate_key /ssl/$KEYFILE;" $NGINXFILE - sed -i "$LINE a ssl_certificate /ssl/$CERTFILE;" $NGINXFILE +#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 "/ssl_certificate /=" $NGINXFILE) + if [ ! -z $LINE ]; then + sed -i "/ssl_certificate/ d" $NGINXFILE + sed -i "$LINE a ssl_certificate_key /ssl/$KEYFILE;" $NGINXFILE + sed -i "$LINE a ssl_certificate /ssl/$CERTFILE;" $NGINXFILE fi - done - bashio::log.info "... done" + fi +done +bashio::log.info "... done"