diff --git a/nextcloud/rootfs/etc/cont-init.d/30-ssl.sh b/nextcloud/rootfs/etc/cont-init.d/30-ssl.sh index e261b011b..9c76a590b 100755 --- a/nextcloud/rootfs/etc/cont-init.d/30-ssl.sh +++ b/nextcloud/rootfs/etc/cont-init.d/30-ssl.sh @@ -7,6 +7,9 @@ if bashio::config.true 'use_own_certs'; then CERTFILE=$(bashio::config 'certfile') KEYFILE=$(bashio::config 'keyfile') + # Validate ssl + bashio::config.require.ssl + #Check if files exist echo "... checking if referenced files exist" [ ! -f /ssl/"$CERTFILE" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$CERTFILE not found" && bashio::exit.nok diff --git a/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh b/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh index 3285092bc..e2dc0cae1 100755 --- a/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh @@ -2,6 +2,8 @@ # shellcheck shell=bash if bashio::config.true 'ssl'; then + # Validate ssl + bashio::config.require.ssl # Adapt nginx template certfile=$(bashio::config 'certfile') @@ -9,11 +11,6 @@ if bashio::config.true 'ssl'; then sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/direct.conf sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/direct.conf - # Check if files exist - echo "... checking if referenced certificates exist" - [ ! -f /ssl/"$certfile" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$certfile not found" && bashio::exit.nok - [ ! -f /ssl/"$keyfile" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$keyfile not found" && bashio::exit.nok - # Configure URL if bashio::config.has_value "PAPERLESS_URL"; then bashio::log.warning "Ssl enabled, your site will be available at $(bashio::config "PAPERLESS_URL"). Don't forget to enable the https alternative port in the addon options."