From 0ea09ae3894a7e22297a7cc998f605153b32365b Mon Sep 17 00:00:00 2001
From: Fredrik Baberg <fredrik.baberg@gmail.com>
Date: Wed, 11 Jan 2023 12:57:12 +0100
Subject: [PATCH] Simplify proxy config

---
 3dprinter-octoprint/config.yaml                |  6 +++---
 .../rootfs/etc/caddy/sites-enabled/any.caddy   |  5 +++++
 .../rootfs/etc/cont-init.d/octoprint.sh        |  2 +-
 .../rootfs/etc/cont-init.d/proxy.sh            | 18 +++++++++---------
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 3dprinter-octoprint/rootfs/etc/caddy/sites-enabled/any.caddy

diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml
index 53f1682..e7cb4cb 100644
--- a/3dprinter-octoprint/config.yaml
+++ b/3dprinter-octoprint/config.yaml
@@ -1,10 +1,10 @@
 name: "3DPrinter-OctoPrint"
-version: "2023.01.05"
+version: "2023.01.0"
 slug: "3dprinter-octoprint"
 description: "OctoPrint as an addon, no additional bells and whistles."
 url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint"
-ingress: true
-ingress_stream: true
+ingress: false
+ingress_stream: false
 panel_icon: mdi:printer-3d
 panel_title: 3DPrinter-OctoPrint
 arch:
diff --git a/3dprinter-octoprint/rootfs/etc/caddy/sites-enabled/any.caddy b/3dprinter-octoprint/rootfs/etc/caddy/sites-enabled/any.caddy
new file mode 100644
index 0000000..f2b6ae2
--- /dev/null
+++ b/3dprinter-octoprint/rootfs/etc/caddy/sites-enabled/any.caddy
@@ -0,0 +1,5 @@
+# OctoPrint WebUI through any access (external or internal)
+:5000 {
+	reverse_proxy http://127.0.0.1:80 {
+	}
+}
diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh
index f562633..3a3fea0 100644
--- a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh
+++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 # ==============================================================================
 # Prepare OctoPrint
 # s6-overlay docs: https://github.com/just-containers/s6-overlay
diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh
index c0dc8bf..f558774 100644
--- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh
+++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh
@@ -5,16 +5,16 @@
 # ==============================================================================
 
 # Generate proxy configuration for any access
-tempio \
-    -template /usr/share/tempio/caddy/Caddyfile.any.gtpl \
-    -out /etc/caddy/sites-enabled/any.caddy
+# tempio \
+#     -template /usr/share/tempio/caddy/Caddyfile.any.gtpl \
+#     -out /etc/caddy/sites-enabled/any.caddy
 
-# Generate proxy configuration for internal access
-bashio::var.json \
-    addon_hostname "$(bashio::addon.hostname)" \
-    | tempio \
-        -template /usr/share/tempio/caddy/Caddyfile.internal.gtpl \
-        -out /etc/caddy/sites-enabled/internal.caddy
+# # Generate proxy configuration for internal access
+# bashio::var.json \
+#     addon_hostname "$(bashio::addon.hostname)" \
+#     | tempio \
+#         -template /usr/share/tempio/caddy/Caddyfile.internal.gtpl \
+#         -out /etc/caddy/sites-enabled/internal.caddy
 
 # Generate proxy configuration for Ingress access
 # bashio::var.json \