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

Disable Ingress for now

Browse Source
This commit is contained in:
Fredrik Baberg 2023-01-11 13:57:36 +01:00
parent a02ab34fdc
commit df46110c2b
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
3dprinter-octoprint/config.yaml
View File

@ -1,10 +1,10 @@
name: "3DPrinter-OctoPrint" name: "3DPrinter-OctoPrint"
version: "2023.01.01" version: "2023.01.0"
slug: "3dprinter-octoprint" slug: "3dprinter-octoprint"
description: "OctoPrint as an addon, no additional bells and whistles." description: "OctoPrint as an addon, no additional bells and whistles."
url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint" url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint"
ingress: true ingress: false
ingress_stream: true ingress_stream: false
panel_icon: mdi:printer-3d panel_icon: mdi:printer-3d
panel_title: 3DPrinter-OctoPrint panel_title: 3DPrinter-OctoPrint
arch: arch:
@ -24,12 +24,12 @@ ports:
ports_description: ports_description:
5000/tcp: Web-based interface 5000/tcp: Web-based interface
options: options:
camera_url: "http://b7aa59c4-camera-mjpg-streamer" # camera_url: "http://b7aa59c4-camera-mjpg-streamer"
mode: normal # mode: normal
trusted_proxies: "" # trusted_proxies: ""
schema: schema:
camera_url: "url?" # camera_url: "url?"
mode: "list(normal|recovery|reverse_proxy_test|camera)?" # mode: "list(normal|recovery|reverse_proxy_test|camera)?"
trusted_proxies: "str?" # trusted_proxies: "str?"
tmpfs: true tmpfs: true
# image: ghcr.io/fredrikbaberg/ha-addon-3dprinter-octoprint-{arch} image: ghcr.io/fredrikbaberg/ha-addon-3dprinter-octoprint-{arch}

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

@ -4,18 +4,16 @@
# Configures proxy # Configures proxy
# ============================================================================== # ==============================================================================
echo "$(bashio::addon.ingress_entry)"
echo "$(bashio::addon.ingress_url)"
# Generate proxy configuration for access by Ingress # Generate proxy configuration for access by Ingress
bashio::var.json \ bashio::var.json \
addon_hostname "$(bashio::addon.hostname)" \ addon_hostname "$(bashio::addon.hostname)" \
addon_ip "$(bashio::addon.ip_address)" \ addon_ip "$(bashio::addon.ip_address)" \
camera_host "$(bashio::config 'camera_url')" \ camera_host "$(bashio::config 'camera_url')" \
ingress_entry "$(bashio::addon.ingress_entry)" \ ingress_entry "$(bashio::addon.ingress_entry)" \
ingress_port "^$(bashio::addon.ingress_port)" \
interface "$(bashio::addon.ip_address)" \ interface "$(bashio::addon.ip_address)" \
mode "$(bashio::config 'mode')" \ mode "$(bashio::config 'mode')" \
port "^$(bashio::addon.ingress_port)" \ supervisor_ip "$(bashio::supervisor.ip_address)" \
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 \

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

@ -1,21 +1,20 @@
:8099 { :{{ .ingress_port }} {
bind {{ .addon_ip }} bind {{ .addon_ip }}
@ingress { @ingress {
remote_ip 172.30.32.2 remote_ip {{ .supervisor_ip }}
} }
uri strip_prefix {{ .ingress_entry }} uri strip_prefix {{ .ingress_entry }}
handle { handle {
reverse_proxy @ingress 127.0.0.1:80 { reverse_proxy @ingress 127.0.0.1:80/ {
header_up X-Script-Name {{ .ingress_entry }} # header_up X-Script-Name {{ .ingress_entry }}
trusted_proxies 172.30.32.2 # trusted_proxies {{ .supervisor_ip }}
} }
} }
} }
}
# :8099 { # :8099 {
# @ingress { # @ingress {
# remote_ip 172.30.32.2 # remote_ip {{ .supervisor_ip }}
# } # }
# uri strip_prefix {{ .ingress_entry }} # uri strip_prefix {{ .ingress_entry }}
# #