Modify services finish script

3dprinter-octoprint/config.yaml

@@ -1,5 +1,5 @@
 name: "3DPrinter-OctoPrint"
-version: "2022.9.022"
+version: "2022.9.023"
 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"

3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh

@@ -4,7 +4,7 @@
 # Configures proxy
 # ==============================================================================
 
-mkdir -p /etc/caddy/sites-enabled
+mkdir -p /etc/caddy/configs
 
 # Generate Ingress configuration
 bashio::var.json \

3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish

@@ -3,7 +3,8 @@
 # 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 }
 
-s6-svscanctl -t /var/run/s6/services
+# if -n { s6-test $# -ne 0 }
+# if -n { s6-test ${1} -eq 256 }
+# 
+# s6-svscanctl -t /var/run/s6/services

3dprinter-octoprint/rootfs/etc/services.d/proxy/finish

@@ -3,5 +3,3 @@
 # Add-on: 3dprinter-octoprint
 # Stop reverse proxy
 # ==============================================================================
-
-caddy stop

3dprinter-octoprint/rootfs/etc/services.d/proxy/run

@@ -9,4 +9,4 @@ bashio::net.wait_for 5000
 
 bashio::log.info "Starting proxy..."
 
-caddy start --config /etc/caddy/Caddyfile --watch
+exec caddy run --config /etc/caddy/Caddyfile

3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl

@@ -1,9 +1,9 @@
-:0899 {
+:8099 {
 	@ingress {
 		remote_ip 172.30.32.2
 	}
 	handle {
-		reverse_proxy @ingress 127.0.0.1:80 {
+		reverse_proxy @ingress 127.0.0.1:5000 {
 			header_up X-Script-Name {{ .ingress_entry }}
 		}
 	}