diff --git a/homelab/Caddyfile b/homelab/Caddyfile index 88ce144..6a2552e 100644 --- a/homelab/Caddyfile +++ b/homelab/Caddyfile @@ -1,5 +1,5 @@ { - email neale@woozle.org + email neale@woozle.org } (restricted-access) { @@ -30,6 +30,10 @@ drive.woozle.org { } } +media.woozle.org { + reverse_proxy jellyfin:8096 +} + # XXX: have this use caddy auth ancestry.woozle.org { reverse_proxy geneweb:2317 @@ -79,7 +83,7 @@ ancestry.woozle.org { handle_path /sucker/* { import restricted-access - reverse_proxy host.docker.internal:5880 + reverse_proxy sucker:8080 } handle_path /octoprint/* { diff --git a/homelab/deploy.sh b/homelab/deploy.sh index 75681bd..b1d7ab9 100755 --- a/homelab/deploy.sh +++ b/homelab/deploy.sh @@ -8,3 +8,4 @@ caddy_hash () { stack=$(basename $(pwd)) docker --context deergrove stack deploy -c docker-compose.yaml --prune $stack +#docker --context deergrove compose up --detach diff --git a/homelab/docker-compose.yaml b/homelab/docker-compose.yaml index 03a5e9a..743d1e6 100644 --- a/homelab/docker-compose.yaml +++ b/homelab/docker-compose.yaml @@ -32,6 +32,8 @@ services: target: /www/index.html - source: index.mjs target: /www/index.mjs + - source: deergrove.png + target: /www/deergrove.png - source: index.css target: /www/index.css - source: browser.html @@ -63,8 +65,6 @@ services: source: /srv target: /srv read_only: true - bind: - propagation: rslave transmission: image: lscr.io/linuxserver/transmission @@ -138,7 +138,7 @@ services: source: /srv/incoming target: /srv/incoming prowlarr: - image: lscr.io/linuxserver/prowlarr:develop + image: lscr.io/linuxserver/prowlarr:latest extra_hosts: - host.docker.internal:host-gateway volumes: @@ -243,8 +243,10 @@ services: - type: bind source: /srv/sys/ddns-updater target: /updater/data - + tunnel: + deploy: + replicas: 0 image: lscr.io/linuxserver/openssh-server user: abc entrypoint: @@ -278,10 +280,10 @@ configs: name: Corefile-v2 Caddyfile: file: Caddyfile - name: Caddyfile-v81 + name: Caddyfile-v86 index.html: file: www/index.html - name: index.html-v35 + name: index.html-v36 index.mjs: file: www/index.mjs name: index.mjs-v1 @@ -291,6 +293,9 @@ configs: browser.html: file: www/browser.html name: browser.html-v3 + deergrove.png: + file: www/deergrove.png + name: deergrove.png-v1 secrets: passwd: @@ -313,3 +318,5 @@ networks: hostnet: external: true name: host + + diff --git a/homelab/unused/jellyfin.yaml b/homelab/unused/jellyfin.yaml index 0f2bea3..8411daf 100644 --- a/homelab/unused/jellyfin.yaml +++ b/homelab/unused/jellyfin.yaml @@ -1,7 +1,7 @@ version: "3.8" services: jellyfin: - image: ghcr.io/linuxserver/jellyfin:10.7.7 + image: ghcr.io/linuxserver/jellyfin:latest ports: - target: 8096 published: 8096 diff --git a/homelab/www/deergrove.png b/homelab/www/deergrove.png new file mode 100644 index 0000000..16817e6 Binary files /dev/null and b/homelab/www/deergrove.png differ diff --git a/homelab/www/index.html b/homelab/www/index.html index 4272954..29df2e7 100644 --- a/homelab/www/index.html +++ b/homelab/www/index.html @@ -4,7 +4,7 @@