From 12625605822f925dc4435c28845c9bb0709b6e9c Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 10 Dec 2023 19:19:26 +0100
Subject: [PATCH] Update and rename 30-nginx.sh to 03-nginx_ssl.sh

---
 .../rootfs/etc/cont-init.d/03-nginx_ssl.sh    | 53 +++++++++++++++++++
 .../rootfs/etc/cont-init.d/30-nginx.sh        | 32 -----------
 2 files changed, 53 insertions(+), 32 deletions(-)
 create mode 100755 qbittorrent/rootfs/etc/cont-init.d/03-nginx_ssl.sh
 delete mode 100755 qbittorrent/rootfs/etc/cont-init.d/30-nginx.sh

diff --git a/qbittorrent/rootfs/etc/cont-init.d/03-nginx_ssl.sh b/qbittorrent/rootfs/etc/cont-init.d/03-nginx_ssl.sh
new file mode 100755
index 000000000..2d2f6cc06
--- /dev/null
+++ b/qbittorrent/rootfs/etc/cont-init.d/03-nginx_ssl.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+set -e
+
+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"
+
+    # Enable ssl in script
+    sed -i "1a ENABLE_SSL=yes" /etc/cont-init.d/04-qbittorrent-setup.sh
+
+    #set variables
+    CERTFILE=$(bashio::config 'certfile')
+    KEYFILE=$(bashio::config 'keyfile')
+
+    # 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"
+    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"
+    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
+    fi
+
+    # Set nginx protocol
+    qbittorrent_protocol=https
+fi
+
+#################
+# NGINX SETTING #
+#################
+
+cp /etc/nginx/templates/ingress.gtpl /etc/nginx/servers/ingress.conf
+
+sed -i "s|{{ .interface }}|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ingress.conf
+sed -i "s|{{ .port }}|$(bashio::addon.ingress_port)|g" /etc/nginx/servers/ingress.conf
+sed -i "s|{{ .protocol }}|${qbittorrent_protocol}|g" /etc/nginx/servers/ingress.conf
+sed -i "s|{{ .certfile }}|$(bashio::config 'certfile')|g" /etc/nginx/servers/ingress.conf
+sed -i "s|{{ .keyfile }}|$(bashio::config 'keyfile')|g" /etc/nginx/servers/ingress.conf
+sed -i "s|{{ .ssl }}|$(bashio::config 'ssl')|g" /etc/nginx/servers/ingress.conf
diff --git a/qbittorrent/rootfs/etc/cont-init.d/30-nginx.sh b/qbittorrent/rootfs/etc/cont-init.d/30-nginx.sh
deleted file mode 100755
index 169f8f801..000000000
--- a/qbittorrent/rootfs/etc/cont-init.d/30-nginx.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-DEBUG=$(bashio::config 'TZ')
-[ "$DEBUG" = "debug" ] && echo "Before declare"
-
-#################
-# NGINX SETTING #
-#################
-
-#declare admin_port
-declare qbittorrent_protocol=http
-
-[ "$DEBUG" = "debug" ] && echo "Before ssl"
-
-# Generate Ingress configuration
-if bashio::config.true 'ssl'; then
-    qbittorrent_protocol=https
-fi
-
-[ "$DEBUG" = "debug" ] && echo "Before cp"
-
-cp /etc/nginx/templates/ingress.gtpl /etc/nginx/servers/ingress.conf
-
-[ "$DEBUG" = "debug" ] && echo "Before sed"
-sed -i "s|{{ .interface }}|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ingress.conf
-sed -i "s|{{ .port }}|$(bashio::addon.ingress_port)|g" /etc/nginx/servers/ingress.conf
-sed -i "s|{{ .protocol }}|${qbittorrent_protocol}|g" /etc/nginx/servers/ingress.conf
-sed -i "s|{{ .certfile }}|$(bashio::config 'certfile')|g" /etc/nginx/servers/ingress.conf
-sed -i "s|{{ .keyfile }}|$(bashio::config 'keyfile')|g" /etc/nginx/servers/ingress.conf
-sed -i "s|{{ .ssl }}|$(bashio::config 'ssl')|g" /etc/nginx/servers/ingress.conf