diff --git a/caddy/Caddyfile b/caddy/Caddyfile index ea37f67..d7ffd4b 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -5,6 +5,9 @@ auth.home.domroese.eu { reverse_proxy 192.168.1.65:8444 } + + + bookstack.domr.ovh, bookstack.home.domroese.eu { tls soenke@domroese.eu @@ -17,7 +20,6 @@ bracket.home.domroese.eu:443 { reverse_proxy 192.168.1.65:3000 } - backend.bracket.domr.ovh:443, backend.bracket.home.domroese.eu:443 { tls soenke@domroese.eu @@ -30,7 +32,6 @@ caddy.home.domroese.eu:443 { reverse_proxy 192.168.1.65:8881 } - api.caddy.domr.ovh, api.caddy.home.domroese.eu:443 { tls soenke@domroese.eu @@ -50,7 +51,6 @@ chartbrew.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:4018 } - chartbrew.domr.ovh:4019, chartbrew.home.domroese.eu:4019 { tls soenke@domroese.eu @@ -161,22 +161,21 @@ memos.home.domroese.eu:443 { reverse_proxy 192.168.1.65:5230 } + + + nas.domr.ovh, nas.home.domroese.eu { tls soenke@domroese.eu { client_auth { mode request } - } - reverse_proxy https://192.168.1.194:5001 { transport http { tls_insecure_skip_verify # Disable TLS Verification, as we don't have a real certificate on the nas } - } - } ntfy.domr.ovh { tls soenke@domroese.eu @@ -202,6 +201,7 @@ paperless.home.domroese.eu:80 { reverse_proxy 192.168.1.65:1000 } + pihole.domr.ovh, pihole.home.domroese.eu { tls soenke@domroese.eu @@ -216,7 +216,6 @@ plantit.home.domroese.eu:443 { reverse_proxy 192.168.1.65:3632 } - api.plantit.domr.ovh, api.plantit.home.domroese.eu:443 { tls soenke@domroese.eu @@ -229,6 +228,11 @@ shiori.home.domroese.eu:443 { reverse_proxy 192.168.1.65:2661 } +sparkyfitness.domr.ovh { + tls soenke@domroese.eu + reverse_proxy 192.168.1.65:3942 +} + speedtesttracker.domr.ovh, speedtesttracker.home.domroese.eu:443 { tls soenke@domroese.eu @@ -241,6 +245,7 @@ pdf.home.domroese.eu:443 { reverse_proxy 192.168.1.65:3614 } + uptimekuma.domr.ovh, uptimekuma.home.domroese.eu { tls soenke@domroese.eu @@ -260,6 +265,7 @@ vikunja.domr.ovh { reverse_proxy 192.168.1.65:3456 } + wallos.domr.ovh, wallos.home.domroese.eu:443 { tls soenke@domroese.eu diff --git a/caddy/Caddyfile.bak b/caddy/Caddyfile.bak index 4ed773c..34ecdd0 100644 --- a/caddy/Caddyfile.bak +++ b/caddy/Caddyfile.bak @@ -1,15 +1,19 @@ + auth.domr.ovh, auth.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8444 } - +/n +/n +/n +/n bookstack.domr.ovh, bookstack.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.65:6875 } - +/n bracket.domr.ovh:443, bracket.home.domroese.eu:443 { tls soenke@domroese.eu @@ -21,7 +25,7 @@ backend.bracket.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8400 } - +/n caddy.domr.ovh, caddy.home.domroese.eu:443 { tls soenke@domroese.eu @@ -33,7 +37,7 @@ api.caddy.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:2019 } - +/n changedetect.domr.ovh:80, changedetect.home.domroese.eu:80, changedetect.domr.ovh:443, @@ -41,86 +45,90 @@ changedetect.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:5238 } - +/n chartbrew.domr.ovh, chartbrew.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:4018 } - chartbrew.domr.ovh:4019, chartbrew.home.domroese.eu:4019 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:4019 } - +/n onboarding.domr.ovh, onboarding.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8517 -} - +}/n convertx.domr.ovh, convertx.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:3410 } - +/n todos.domr.ovh, #donetick todos.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:2021 } - +/n erugo.domr.ovh, erugo.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:9997 } - +/n excalidraw.domr.ovh, excalidraw.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8267 } - +/n firefly.domr.ovh, firefly.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8950 } - +/n rss.domr.ovh, rss.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8884 } - +/n git.domr.ovh, git.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.194:8418 } - +/n guac.domr.ovh, guac.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.65:6080 } - +/n homarr.domr.ovh, homarr.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:7575 } - +/n +homebox.domr.ovh, +homebox.home.domroese.eu:443 { + tls soenke@domroese.eu + reverse_proxy 192.168.1.65:3100 +} +/n homepage.domr.ovh:80, homepage.domr.ovh:443, homepage.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:3891 } - +/n ittools.domr.ovh:443, ittools.home.domroese.eu:443, ittools.domr.ovh:80, @@ -128,31 +136,34 @@ ittools.home.domroese.eu:80 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:9080 } - +/n jenkins.domr.ovh, jenkins.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8040 } - +/n kopia.domr.ovh, kopia.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.65:51515 } - +/n mealie.domr.ovh, mealie.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:9925 } - +/n memos.domr.ovh, memos.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:5230 } - +/n +/n +/n +/n nas.domr.ovh, nas.home.domroese.eu { tls soenke@domroese.eu { @@ -165,25 +176,23 @@ nas.home.domroese.eu { tls_insecure_skip_verify # Disable TLS Verification, as we don't have a real certificate on the nas } } -} - +}/n ntfy.domr.ovh { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8234 } - +/n chat.domr.ovh, chat.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:1180 -} - +}/n omnitools.domr.ovh, omnitools.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8579 } - +/n paperless.domr.ovh:443, paperless.home.domroese.eu:443, paperless.domr.ovh:80, @@ -191,13 +200,16 @@ paperless.home.domroese.eu:80 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:1000 } - +/n +/n pihole.domr.ovh, pihole.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.65:2000 } + +/n plantit.domr.ovh, plantit.home.domroese.eu:443 { tls soenke@domroese.eu @@ -209,31 +221,37 @@ api.plantit.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8632 } - +/n shiori.domr.ovh, shiori.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:2661 } - +/n +sparkyfitness.domr.ovh { + tls soenke@domroese.eu + reverse_proxy 192.168.1.65:3942 +} +/n speedtesttracker.domr.ovh, speedtesttracker.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:1378 } - +/n pdf.domr.ovh, pdf.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:3614 } - +/n +/n uptimekuma.domr.ovh, uptimekuma.home.domroese.eu { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8030 } - +/n vault.domr.ovh:443, vault.home.domroese.eu:443, vault.domr.ovh:80, @@ -241,15 +259,16 @@ vault.home.domroese.eu:80 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:4080 } - -vikunja.domr.ovh:80, -vikunja.domr.ovh:443 { +/n +vikunja.domr.ovh { tls soenke@domroese.eu reverse_proxy 192.168.1.65:3456 } - +/n +/n wallos.domr.ovh, wallos.home.domroese.eu:443 { tls soenke@domroese.eu reverse_proxy 192.168.1.65:8282 } +/n diff --git a/changedetect/docker-compose.yaml b/changedetect/docker-compose.yaml index 70f4c6e..3c4e251 100644 --- a/changedetect/docker-compose.yaml +++ b/changedetect/docker-compose.yaml @@ -7,7 +7,7 @@ services: - PUID=1000 - PGID=1000 - TZ=Etc/UTC - - BASE_URL= #optional + - BASE_URL= https://changedetect.domr.ovh/ - PLAYWRIGHT_DRIVER_URL= #optional volumes: - /home/soenke/docker-data/changedetect/config:/config diff --git a/restartcaddy.sh b/restartcaddy.sh index 116fedb..b217181 100755 --- a/restartcaddy.sh +++ b/restartcaddy.sh @@ -4,6 +4,7 @@ echo "Collecting Caddyfileparts" for dir in *; do if [ -d "$dir" ]; then ( cd "$dir" && cat Caddyfilepart >> /home/soenke/docker/caddy/newCaddyfile) + echo -en '\n' >> /home/soenke/docker/caddy/newCaddyfile fi done