From 59c2c1d42a759d7889e21b5ae3e67e1790c01f37 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 10 Dec 2023 19:24:31 +0100
Subject: [PATCH] Update 03-nginx_ssl.sh

---
 .../rootfs/etc/cont-init.d/03-nginx_ssl.sh       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/qbittorrent/rootfs/etc/cont-init.d/03-nginx_ssl.sh b/qbittorrent/rootfs/etc/cont-init.d/03-nginx_ssl.sh
index 2d2f6cc06..09994e1ab 100755
--- a/qbittorrent/rootfs/etc/cont-init.d/03-nginx_ssl.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/03-nginx_ssl.sh
@@ -8,7 +8,6 @@ qbittorrent_protocol="http"
 # SSL CONFIG   #
 ################
 
-bashio::config.require.ssl
 if bashio::config.true 'ssl'; then
     bashio::log.info "ssl enabled. If webui don't work, disable ssl or check your certificate paths"
 
@@ -17,19 +16,21 @@ if bashio::config.true 'ssl'; then
 
     #set variables
     CERTFILE=$(bashio::config 'certfile')
+    CERTFILE="${CERTFILE:-null}"
     KEYFILE=$(bashio::config 'keyfile')
+    KEYFILE="${KEYFILE:-null}"
 
-    # Correct files
-    if [ -f /config/qBittorrent/config/WebUICertificate.crt ]; then
-        bashio::log.warning "... you have a file in /config/qBittorrent/config/WebUICertificate.crt, it will be used instead of the CERFILE option"
+    # Correct certificate file
+    if [ ! -f /ssl/"$CERTFILE" ]; then
+        bashio::log.warning "... CERTFILE option not found or valid, using self-generated /config/qBittorrent/config/WebUICertificate.crt"
     else
         sed -i "s|/config/qBittorrent/config/WebUICertificate.crt|/ssl/$CERTFILE|g" /etc/cont-init.d/04-qbittorrent-setup.sh
         sed -i "s|WebUICertificate.crt|$CERTFILE|g" /etc/cont-init.d/04-qbittorrent-setup.sh
     fi
     
-    # Correct files
-    if [ -f /config/qBittorrent/config/WebUIKey.key ]; then
-        bashio::log.warning "... you have a file in /config/qBittorrent/config/WebUIKey.key, it will be used instead of the KEYFILE option"
+    # Correct keyfile
+    if [ ! -f /ssl/"$KEYFILE" ]; then
+        bashio::log.warning "... KEYFILE option not found or valid, using self-generated /config/qBittorrent/config/WebUICertificate.crt"
     else
         sed -i "s|/config/qBittorrent/config/WebUIKey.key|/ssl/$KEYFILE|g" /etc/cont-init.d/04-qbittorrent-setup.sh
         sed -i "s|WebUIKey.key|$KEYFILE|g" /etc/cont-init.d/04-qbittorrent-setup.sh
@@ -37,6 +38,7 @@ if bashio::config.true 'ssl'; then
 
     # Set nginx protocol
     qbittorrent_protocol=https
+
 fi
 
 #################