diff --git a/homelab/Caddyfile b/homelab/Caddyfile index 49a56a2..14e7a8d 100644 --- a/homelab/Caddyfile +++ b/homelab/Caddyfile @@ -40,7 +40,12 @@ ancestry.woozle.org { ## handle_path truncates path ## -deergrove.woozle.org, sweetums.lan { +(deergrove) { + handle_path /ddns/* { + import restricted-access + reverse_proxy ddns:8000 + } + handle /nzbget/* { import restricted-access reverse_proxy nzbget:6789 @@ -75,7 +80,7 @@ deergrove.woozle.org, sweetums.lan { handle_path /octoprint/* { import restricted-access reverse_proxy { - to 192.168.86.36:80 + to 192.168.86.20:80 header_up X-Script-Name "/octoprint" } } @@ -109,3 +114,12 @@ deergrove.woozle.org, sweetums.lan { } } +deergrove.woozle.org { + import deergrove +} + +sweetums.lan { + tls internal + import deergrove +} + diff --git a/homelab/Corefile b/homelab/Corefile new file mode 100644 index 0000000..e5f22a2 --- /dev/null +++ b/homelab/Corefile @@ -0,0 +1,8 @@ +. { + bind lan + hosts { + 192.168.86.2 sweetums.woozle.org deergrove.woozle.org drive.woozle.org git.woozle.org ancestry.woozle.org + fallthrough + } + forward . 8.8.8.8 +} diff --git a/homelab/docker-compose.yaml b/homelab/docker-compose.yaml index ae31800..a376c27 100644 --- a/homelab/docker-compose.yaml +++ b/homelab/docker-compose.yaml @@ -1,28 +1,12 @@ version: "3.8" services: - tunnel: - image: lscr.io/linuxserver/openssh-server - user: abc - entrypoint: - - /usr/bin/ssh - - -N - - -R 172.17.0.1:5880:caddy:80 # 172.17.0.1 = docker host IP - - -R :5822:host.docker.internal:22 - - -o ServerAliveInterval=30 - - core@melville.woozle.org - extra_hosts: - - host.docker.internal:host-gateway - secrets: - - source: tunnel - target: /config/.ssh/id_rsa - uid: "911" - gid: "911" - mode: 0600 - - source: known_hosts - target: /config/.ssh/known_hosts - uid: "911" - gid: "911" - mode: 0600 + coredns: + image: coredns/coredns + networks: + - hostnet + configs: + - source: Corefile + target: /Corefile caddy: image: caddy:2-alpine @@ -63,7 +47,7 @@ services: - simpleauth.key plex: - image: ghcr.io/linuxserver/plex + image: ghcr.io/linuxserver/plex:1.29.2 networks: - hostnet environment: @@ -241,13 +225,50 @@ services: target: /config/config.yaml user: "911:911" + ddns: + image: qmcgaw/ddns-updater + networks: + - hostnet + volumes: + - type: bind + source: /srv/sys/ddns-updater + target: /updater/data + + tunnel: + image: lscr.io/linuxserver/openssh-server + user: abc + entrypoint: + - /usr/bin/ssh + - -N + - -R 172.17.0.1:5880:caddy:80 # 172.17.0.1 = docker host IP + - -R :5822:host.docker.internal:22 + - -o ServerAliveInterval=30 + - core@melville.woozle.org + extra_hosts: + - host.docker.internal:host-gateway + secrets: + - source: tunnel + target: /config/.ssh/id_rsa + uid: "911" + gid: "911" + mode: 0600 + - source: known_hosts + target: /config/.ssh/known_hosts + uid: "911" + gid: "911" + mode: 0600 + + configs: dave.yaml: file: dave.yaml name: dave.yaml-v3 + Corefile: + file: Corefile + name: Corefile-v2 Caddyfile: file: Caddyfile - name: Caddyfile-v71 + name: Caddyfile-v74 index.html: file: www/index.html name: index.html-v34