From 5f2473f0e0465e79bdf44512fda902ceaa83a7f1 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 2 Aug 2021 10:37:25 +0200
Subject: [PATCH] test ingress

---
 filebrowser/config.json   |  2 +-
 filebrowser/rootfs/run.sh | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/filebrowser/config.json b/filebrowser/config.json
index f0babc987..c3009d290 100644
--- a/filebrowser/config.json
+++ b/filebrowser/config.json
@@ -6,7 +6,7 @@
   "description": "filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "startup": "services",
-  "ingress": false,
+  "ingress": true,
   "ingress_port": 8099,
   "panel_icon": "mdi:file-search",
   "arch": [
diff --git a/filebrowser/rootfs/run.sh b/filebrowser/rootfs/run.sh
index 684bda3e8..ed61d9c8b 100644
--- a/filebrowser/rootfs/run.sh
+++ b/filebrowser/rootfs/run.sh
@@ -135,13 +135,13 @@ declare ingress_interface
 declare ingress_port
 declare keyfile
 
-#port=$(bashio::addon.port 80)
-#ingress_port=$(bashio::addon.ingress_port)
-#ingress_interface=$(bashio::addon.ip_address)
-#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/%%baseurl%%/filebrowser/g" /etc/nginx/servers/ingress.conf
-#mkdir -p /var/log/nginx && touch /var/log/nginx/error.log
+port=$(bashio::addon.port 80)
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+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/%%baseurl%%/filebrowser/g" /etc/nginx/servers/ingress.conf
+mkdir -p /var/log/nginx && touch /var/log/nginx/error.log
 
 ###################
 # SSL CONFIG v1.0 #
@@ -192,9 +192,8 @@ fi
 
 bashio::log.info "Please wait 1 or 2 minutes to allow the server to load"
 
-/./filebrowser $CERTFILE $KEYFILE --root=/ --address=0.0.0.0 --database=/config/filebrowser/filebrowser.dB $NOAUTH 
+/./filebrowser $CERTFILE $KEYFILE --root=/ --address=0.0.0.0 --database=/config/filebrowser/filebrowser.dB $NOAUTH \
 
-#& \
-#bashio::net.wait_for 8080 localhost 900 || true
-#bashio::log.info "Nginx started for Ingress" 
-#exec nginx
+& bashio::net.wait_for 8080 localhost 900 || true
+bashio::log.info "Nginx started for Ingress" 
+exec nginx