From cc5efc024e58793ce3f9cf28602b97dd05cc4d79 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Mon, 20 Mar 2023 15:55:10 +0100
Subject: [PATCH] Ingress addition

---
 autobrr/CHANGELOG.md                               |  6 ++----
 autobrr/config.json                                | 10 ++++++----
 autobrr/rootfs/etc/cont-init.d/32-nginx_ingress.sh |  1 +
 autobrr/rootfs/etc/cont-init.d/91-run.sh           | 10 ++--------
 autobrr/rootfs/etc/nginx/servers/ingress.conf      | 13 +++++++------
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/autobrr/CHANGELOG.md b/autobrr/CHANGELOG.md
index b7c0ef382..dea99929d 100644
--- a/autobrr/CHANGELOG.md
+++ b/autobrr/CHANGELOG.md
@@ -1,8 +1,6 @@
+- Ingress addition
 
 ## 1.19.0 (18-03-2023)
+
 - Update to latest version from autobrr/autobrr
-### v1.9.0 (17-03-2023)
-- Minor bugs fixed
-### 1.9.0 (17-03-2023)
-- Minor bugs fixed
 - First version
diff --git a/autobrr/config.json b/autobrr/config.json
index 9054744af..5eda208d4 100644
--- a/autobrr/config.json
+++ b/autobrr/config.json
@@ -45,10 +45,12 @@
     "BASE_DOCKER_DATA_PATH": "/data/autobrr",
     "PGID": "0",
     "PUID": "0",
-    "WEBUI_PORT": "7474"
+    "WEBUI_PASSWORD": "password",
+    "WEBUI_PORT": "7474",
+    "WEBUI_USERNAME": "admin"
   },
   "image": "ghcr.io/alexbelgium/autobrr-{arch}",
-  "ingress_entry": "hassioautobrr",
+  "ingress": true,
   "init": false,
   "map": [
     "config:rw",
@@ -83,6 +85,6 @@
   },
   "slug": "autobrr",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/autobrr",
-  "version": "1.19.0",
+  "version": "1.19.0-2",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:7474]"
-}
+}
\ No newline at end of file
diff --git a/autobrr/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/autobrr/rootfs/etc/cont-init.d/32-nginx_ingress.sh
index f307cd7af..599020efe 100755
--- a/autobrr/rootfs/etc/cont-init.d/32-nginx_ingress.sh
+++ b/autobrr/rootfs/etc/cont-init.d/32-nginx_ingress.sh
@@ -13,3 +13,4 @@ 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
+sed -i "s|%%ingress_entry2%%|${ingress_entry////\\/}|g" /etc/nginx/servers/ingress.conf
diff --git a/autobrr/rootfs/etc/cont-init.d/91-run.sh b/autobrr/rootfs/etc/cont-init.d/91-run.sh
index 6b52788d6..d80a5e1ef 100755
--- a/autobrr/rootfs/etc/cont-init.d/91-run.sh
+++ b/autobrr/rootfs/etc/cont-init.d/91-run.sh
@@ -6,15 +6,9 @@
 ###############
 
 # Set UrlBase
-#if ! grep -q "hassioautobrr" /config/addons_config/autobrr/config.toml; then
-#  bashio::log.warning "BaseUrl not set properly, restarting"
-#  sed -i "/baseUrl/d" /config/addons_config/autobrr/config.toml
-#  sed -i "/# Base url/a baseUrl = \"\/hassioautobrr\/\"" /config/addons_config/autobrr/config.toml
-#  bashio::addon.restart
-#fi
 
-#bashio::log.info "Starting NGinx..."
-#nginx & true
+bashio::log.info "Starting NGinx..."
+nginx & true
 
 #############
 # Start app #
diff --git a/autobrr/rootfs/etc/nginx/servers/ingress.conf b/autobrr/rootfs/etc/nginx/servers/ingress.conf
index 3af7e2ea6..ebb8d2da3 100644
--- a/autobrr/rootfs/etc/nginx/servers/ingress.conf
+++ b/autobrr/rootfs/etc/nginx/servers/ingress.conf
@@ -11,19 +11,20 @@ server {
        proxy_connect_timeout 30m;
        proxy_send_timeout 30m;
        proxy_read_timeout 30m;
-       proxy_pass         http://127.0.0.1:7474;
+       proxy_pass         http://0.0.0.0:7474;
 
        # Allow signalr
-       proxy_http_version 1.1;
-       proxy_set_header Upgrade $http_upgrade;
-       proxy_set_header Connection $http_connection;
-       #auth_basic off;
+       proxy_http_version   1.1;
+       proxy_set_header     Upgrade             $http_upgrade;
+       proxy_set_header     Connection          $http_connection;
+       proxy_set_header     X-Forwarded-Host    $http_host;
 
        # Correct base_url
        proxy_set_header Accept-Encoding "";
        sub_filter_once off;
        sub_filter_types *;
-       sub_filter /hassioautobrr %%ingress_entry%%/hassioautobrr;
+       sub_filter 'href="/"' 'href="%%ingress_entry%%/"';
+       sub_filter '"\/"' '"%%ingress_entry2%%\/"';
     }
 
 }