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

Use suffix for Caddy config files

Browse Source
This commit is contained in:
Fredrik Baberg 2022-10-02 22:56:13 +02:00
parent d2801c1e14
commit e5cf716506
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3dprinter-octoprint/config.yaml
View File

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

2
3dprinter-octoprint/rootfs/etc/caddy/Caddyfile
View File

@ -1 +1 @@
import sites-enabled/* import configs/*.caddy

0
3dprinter-octoprint/rootfs/etc/caddy/configs/.gitkeep Normal file
View File

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

@ -14,7 +14,7 @@ bashio::var.json \
camera_host "$(bashio::config 'camera_url')" \ camera_host "$(bashio::config 'camera_url')" \
| tempio \ | tempio \
-template /usr/share/tempio/Caddyfile.ingress.gtpl \ -template /usr/share/tempio/Caddyfile.ingress.gtpl \
-out /etc/caddy/sites-enabled/ingress -out /etc/caddy/configs/ingress.caddy
# Generate direct access configuration, if enabled. # Generate direct access configuration, if enabled.
if bashio::var.has_value "$(bashio::addon.port 5000)"; then if bashio::var.has_value "$(bashio::addon.port 5000)"; then
@ -23,5 +23,5 @@ if bashio::var.has_value "$(bashio::addon.port 5000)"; then
port "^$(bashio::addon.port 5000)" \ port "^$(bashio::addon.port 5000)" \
| tempio \ | tempio \
-template /usr/share/tempio/Caddyfile.direct.gtpl \ -template /usr/share/tempio/Caddyfile.direct.gtpl \
-out /etc/caddy/sites-enabled/direct -out /etc/caddy/configs/direct.caddy
fi fi

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

@ -1,14 +1,10 @@
:{{ .port }} { :0899 {
@ingress { @ingress {
remote_ip {{ .interface }} remote_ip 172.30.32.2
} }
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 }}
# header_up -Origin
# header_up Origin 172.30.32.2
# header_up X-Forwarded-For 172.30.32.2
# flush_interval -1
} }
} }
} }