From 388caed235a8d1c60c89959cbf4828e7379841b9 Mon Sep 17 00:00:00 2001
From: Fredrik Baberg <fredrik.baberg@gmail.com>
Date: Mon, 11 Jul 2022 16:23:59 +0200
Subject: [PATCH] Updates to Ingress, use local image

---
 3dprinter-octoprint/config.yaml                            | 1 -
 3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh        | 1 +
 3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl | 2 +-
 3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish | 4 ++--
 3dprinter-octoprint/rootfs/etc/services.d/octoprint/run    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml
index ac27a25..bf650a8 100644
--- a/3dprinter-octoprint/config.yaml
+++ b/3dprinter-octoprint/config.yaml
@@ -27,5 +27,4 @@ options:
     recovery: false
 schema:
     recovery: "bool"
-image: ghcr.io/fredrikbaberg/addon-3dprinter-octoprint-{arch}
 tmpfs: true
diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh
index abbf207..8d0a0f4 100644
--- a/3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh
+++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh
@@ -16,6 +16,7 @@ bashio::var.json \
 # Generate direct access configuration, if enabled.
 if bashio::var.has_value "$(bashio::addon.port 80)"; then
     bashio::var.json \
+        interface "$(bashio::addon.ip_address)" \
         port "^$(bashio::addon.port 80)" \
         | tempio \
             -template /etc/nginx/templates/direct.gtpl \
diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl
index 2fd0020..b501ded 100644
--- a/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl
+++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl
@@ -1,5 +1,5 @@
 server {
-    listen {{ .port }} default_server;
+    listen {{ .interface }}:{{ .port }} default_server;
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
diff --git a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish
index 1ecc5e9..4cea07a 100644
--- a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish
+++ b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish
@@ -1,7 +1,7 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Add-on: mjpg-streamer
-# Take down the S6 supervision tree when mjpg-streamer fails
+# Add-on: 3dprinter-octoprint
+# Take down the S6 supervision tree when OctoPrint fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
 if -n { s6-test ${1} -eq 256 }
diff --git a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run
index bbdf675..c150721 100644
--- a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run
+++ b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run
@@ -5,4 +5,4 @@
 # ==============================================================================
 
 ## Run your program
-exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --port 5000 --basedir /data/config/octoprint
+exec octoprint serve --iknowwhatimdoing --host 127.0.0.1 --port 5000 --basedir /data/config/octoprint --debug