From 478544a3debd67ea1615c71a31fa48cec5a75c5a Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Wed, 11 Jan 2023 11:37:30 +0100 Subject: [PATCH] Update internal port to 5000. --- .../rootfs/etc/cont-init.d/octoprint.sh | 2 +- .../rootfs/etc/cont-init.d/proxy.sh | 28 +++++++++---------- .../rootfs/etc/services.d/octoprint/run | 2 +- .../rootfs/etc/services.d/proxy/run | 2 +- .../usr/share/tempio/caddy/Caddyfile.any.gtpl | 4 +-- .../share/tempio/caddy/Caddyfile.ingress.gtpl | 19 +------------ .../tempio/caddy/Caddyfile.internal.gtpl | 2 +- 7 files changed, 21 insertions(+), 38 deletions(-) diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh index bf7a1b7..c3a12f3 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh @@ -29,7 +29,7 @@ function updateConfigRequired() { octoprint $BASEDIR config set server.commands.systemRestartCommand "/scripts/system_restart.sh" octoprint $BASEDIR config set server.commands.systemShutdownCommand "/scripts/system_shutdown.sh" octoprint $BASEDIR config set server.host "127.0.0.1" - octoprint $BASEDIR config set --int server.port 80 + octoprint $BASEDIR config set --int server.port 5000 octoprint $BASEDIR config set webcam.ffmpeg "/usr/bin/ffmpeg" } diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh index 4e80338..0a85432 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh @@ -5,10 +5,10 @@ # # ============================================================================== # Generate proxy configuration for any access -bashio::var.json \ - | tempio \ - -template /usr/share/tempio/caddy/Caddyfile.any.gtpl \ - -out /etc/caddy/sites-enabled/any.caddy +# bashio::var.json \ +# | 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 \ @@ -18,16 +18,16 @@ bashio::var.json \ -out /etc/caddy/sites-enabled/internal.caddy # Generate proxy configuration for Ingress access -bashio::var.json \ - interface "$(bashio::addon.ip_address)" \ - port "^$(bashio::addon.ingress_port)" \ - ingress_entry "$(bashio::addon.ingress_entry)" \ - camera_host "$(bashio::config 'camera_url')" \ - mode "$(bashio::config 'mode')" \ - trusted_proxies "$(bashio::config 'trusted_proxies')" \ - | tempio \ - -template /usr/share/tempio/caddy/Caddyfile.ingress.gtpl \ - -out /etc/caddy/sites-enabled/ingress.caddy +# bashio::var.json \ +# interface "$(bashio::addon.ip_address)" \ +# port "^$(bashio::addon.ingress_port)" \ +# ingress_entry "$(bashio::addon.ingress_entry)" \ +# camera_host "$(bashio::config 'camera_url')" \ +# mode "$(bashio::config 'mode')" \ +# trusted_proxies "$(bashio::config 'trusted_proxies')" \ +# | tempio \ +# -template /usr/share/tempio/caddy/Caddyfile.ingress.gtpl \ +# -out /etc/caddy/sites-enabled/ingress.caddy # # Make sure file is correctly formatted. # caddy fmt --overwrite /etc/caddy/Caddyfile diff --git a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run index 95750a1..81eaf4c 100644 --- a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run +++ b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run @@ -7,4 +7,4 @@ bashio::log.info "Starting OctoPrint..." ## Run your program -exec octoprint --basedir /data/config/octoprint serve --iknowwhatimdoing --host 127.0.0.1 --port 80 +exec octoprint --basedir /data/config/octoprint serve --iknowwhatimdoing --host 127.0.0.1 --port 5000 diff --git a/3dprinter-octoprint/rootfs/etc/services.d/proxy/run b/3dprinter-octoprint/rootfs/etc/services.d/proxy/run index 0edf12f..4c93df1 100644 --- a/3dprinter-octoprint/rootfs/etc/services.d/proxy/run +++ b/3dprinter-octoprint/rootfs/etc/services.d/proxy/run @@ -5,7 +5,7 @@ # ============================================================================== # Wait for OctoPrint WebUI to be available -bashio::net.wait_for 80 +bashio::net.wait_for 5000 bashio::log.info "Starting proxy..." diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl index 3885174..16428a9 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl @@ -1,5 +1,5 @@ -# OctoPrint WebUI through external access +# OctoPrint WebUI through any access :5000 { - reverse_proxy http://127.0.0.1:80 { + reverse_proxy http://127.0.0.1:5000 { } } diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl index e225ae4..8bfba2b 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl @@ -1,11 +1,3 @@ -{ - debug - log { - format console - output file /var/log/caddy/caddy.log - } -} - :8099 { @ingress { remote_ip 172.30.32.2 @@ -26,7 +18,7 @@ {{ else if eq .mode "reverse_proxy_test" }} rewrite / /reverse_proxy_test {{ end }} - reverse_proxy @ingress 127.0.0.1:80 { + reverse_proxy @ingress 127.0.0.1:5000 { header_up X-Script-Name {{ .ingress_entry }} trusted_proxies 172.30.32.2 # header_up -Origin @@ -37,12 +29,3 @@ } } } - -# OctoPrint WebUI -:5000 { - reverse_proxy http://127.0.0.1:80 { - {{ if .trusted_proxies }} - trusted_proxies {{ .trusted_proxies }} - {{ end }} - } -} diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl index c622cd6..7cdb867 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl @@ -1,5 +1,5 @@ # WebUI through internal hostname {{ .internal_hostname }}:5000 { - reverse_proxy http://127.0.0.1:80 { + reverse_proxy http://127.0.0.1:5000 { } }