gronod/ha-3dprinter-addons
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update internal port to 5000.

Browse Source
This commit is contained in:
Fredrik Baberg 2023-01-11 11:37:30 +01:00
parent 08aa3cd32a
commit 478544a3de
7 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh
View File

@ -29,7 +29,7 @@ function updateConfigRequired() {
octoprint $BASEDIR config set server.commands.systemRestartCommand "/scripts/system_restart.sh" 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.commands.systemShutdownCommand "/scripts/system_shutdown.sh"
octoprint $BASEDIR config set server.host "127.0.0.1" 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" octoprint $BASEDIR config set webcam.ffmpeg "/usr/bin/ffmpeg"
} }

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

@ -5,10 +5,10 @@
# # ============================================================================== # # ==============================================================================
# Generate proxy configuration for any access # Generate proxy configuration for any access
bashio::var.json \ # bashio::var.json \
| tempio \ # | tempio \
-template /usr/share/tempio/caddy/Caddyfile.any.gtpl \ # -template /usr/share/tempio/caddy/Caddyfile.any.gtpl \
-out /etc/caddy/sites-enabled/any.caddy # -out /etc/caddy/sites-enabled/any.caddy
# Generate proxy configuration for internal access # Generate proxy configuration for internal access
bashio::var.json \ bashio::var.json \
@ -18,16 +18,16 @@ bashio::var.json \
-out /etc/caddy/sites-enabled/internal.caddy -out /etc/caddy/sites-enabled/internal.caddy
# Generate proxy configuration for Ingress access # Generate proxy configuration for Ingress access
bashio::var.json \ # bashio::var.json \
interface "$(bashio::addon.ip_address)" \ # interface "$(bashio::addon.ip_address)" \
port "^$(bashio::addon.ingress_port)" \ # port "^$(bashio::addon.ingress_port)" \
ingress_entry "$(bashio::addon.ingress_entry)" \ # ingress_entry "$(bashio::addon.ingress_entry)" \
camera_host "$(bashio::config 'camera_url')" \ # camera_host "$(bashio::config 'camera_url')" \
mode "$(bashio::config 'mode')" \ # mode "$(bashio::config 'mode')" \
trusted_proxies "$(bashio::config 'trusted_proxies')" \ # trusted_proxies "$(bashio::config 'trusted_proxies')" \
| tempio \ # | tempio \
-template /usr/share/tempio/caddy/Caddyfile.ingress.gtpl \ # -template /usr/share/tempio/caddy/Caddyfile.ingress.gtpl \
-out /etc/caddy/sites-enabled/ingress.caddy # -out /etc/caddy/sites-enabled/ingress.caddy
# # Make sure file is correctly formatted. # # Make sure file is correctly formatted.
# caddy fmt --overwrite /etc/caddy/Caddyfile # caddy fmt --overwrite /etc/caddy/Caddyfile

2
3dprinter-octoprint/rootfs/etc/services.d/octoprint/run
View File

@ -7,4 +7,4 @@
bashio::log.info "Starting OctoPrint..." bashio::log.info "Starting OctoPrint..."
## Run your program ## 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

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

@ -5,7 +5,7 @@
# ============================================================================== # ==============================================================================
# Wait for OctoPrint WebUI to be available # Wait for OctoPrint WebUI to be available
bashio::net.wait_for 80 bashio::net.wait_for 5000
bashio::log.info "Starting proxy..." bashio::log.info "Starting proxy..."

4
3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl
View File

@ -1,5 +1,5 @@
# OctoPrint WebUI through external access # OctoPrint WebUI through any access
:5000 { :5000 {
reverse_proxy http://127.0.0.1:80 { reverse_proxy http://127.0.0.1:5000 {
} }
} }

19
3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl
View File

@ -1,11 +1,3 @@
{
debug
log {
format console
output file /var/log/caddy/caddy.log
}
}
:8099 { :8099 {
@ingress { @ingress {
remote_ip 172.30.32.2 remote_ip 172.30.32.2
@ -26,7 +18,7 @@
{{ else if eq .mode "reverse_proxy_test" }} {{ else if eq .mode "reverse_proxy_test" }}
rewrite / /reverse_proxy_test rewrite / /reverse_proxy_test
{{ end }} {{ end }}
reverse_proxy @ingress 127.0.0.1:80 { reverse_proxy @ingress 127.0.0.1:5000 {
header_up X-Script-Name {{ .ingress_entry }} header_up X-Script-Name {{ .ingress_entry }}
trusted_proxies 172.30.32.2 trusted_proxies 172.30.32.2
# header_up -Origin # 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 }}
}
}

2
3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl
View File

@ -1,5 +1,5 @@
# WebUI through internal hostname # WebUI through internal hostname
{{ .internal_hostname }}:5000 { {{ .internal_hostname }}:5000 {
reverse_proxy http://127.0.0.1:80 { reverse_proxy http://127.0.0.1:5000 {
} }
} }