From 0944ba45ecb5c72aede9e669c540b3ebfd777596 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 14 Oct 2023 22:22:42 +0200
Subject: [PATCH] Update and rename 32-ingress.sh to 32-nginx.sh

---
 .../rootfs/etc/cont-init.d/32-ingress.sh      | 22 -------------------
 .../rootfs/etc/cont-init.d/32-nginx.sh        | 21 ++++++++++++++++++
 2 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100755 tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh
 create mode 100755 tandoor_recipes/rootfs/etc/cont-init.d/32-nginx.sh

diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh b/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh
deleted file mode 100755
index de22468fe..000000000
--- a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/bashio
-# shellcheck shell=bash
-set -e
-
-if [[ -n "${DISABLE_INGRESS}" ]]; then
-    bashio::log.info "Ingress disabled"
-    sed -i "/nginx/d" /etc/cont-init.d/99-run.sh
-    exit 0
-fi
-
-#################
-# NGINX SETTING #
-#################
-declare ingress_interface
-declare ingress_port
-
-ingress_port="$(bashio::addon.ingress_port)"
-ingress_interface="$(bashio::addon.ip_address)"
-ingress_entry=$(bashio::addon.ingress_entry)
-sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
-sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
-sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/32-nginx.sh b/tandoor_recipes/rootfs/etc/cont-init.d/32-nginx.sh
new file mode 100755
index 000000000..f966485a7
--- /dev/null
+++ b/tandoor_recipes/rootfs/etc/cont-init.d/32-nginx.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/bashio
+# shellcheck shell=bash
+set -e
+
+if bashio::config.true 'ssl'; then
+
+    # Validate ssl
+    bashio::config.require.ssl
+
+    # Adapt nginx template
+    certfile=$(bashio::config 'certfile')
+    keyfile=$(bashio::config 'keyfile')
+    sed -i "s|%%certfile%%|${certfile}|g" /etc/nginx/servers/ssl.conf
+    sed -i "s|%%keyfile%%|${keyfile}|g" /etc/nginx/servers/ssl.conf
+    sed -i "s|3000;|3000 ssl;|g" /etc/nginx/servers/ssl.conf
+
+else
+
+    sed -i "/ssl/d" /etc/nginx/servers/ssl.conf
+
+fi