Compare commits

..

No commits in common. "4d469a61698425f84cc25fc4526bc871e87787de" and "aa3f31af0355e98af8bc85ca371603febe6e3b11" have entirely different histories.

2 changed files with 54 additions and 51 deletions

View File

@ -23,8 +23,8 @@ drive.woozle.org {
# route overrides built-in ordering # route overrides built-in ordering
route { route {
file_server @nondav { file_server @nondav {
root /srv/ root /srv/ext/
browse browse /www/browse.html
} }
reverse_proxy webdav:8000 reverse_proxy webdav:8000
} }
@ -41,6 +41,11 @@ ancestry.woozle.org {
## ##
deergrove.woozle.org, sweetums.woozle.org { deergrove.woozle.org, sweetums.woozle.org {
handle_path /qbittorrent/* {
import restricted-access
reverse_proxy host.docker.internal:6880
}
handle /transmission/* { handle /transmission/* {
import restricted-access import restricted-access
reverse_proxy host.docker.internal:9091 reverse_proxy host.docker.internal:9091
@ -102,7 +107,7 @@ deergrove.woozle.org, sweetums.woozle.org {
handle_path /public/* { handle_path /public/* {
file_server { file_server {
root /srv/storage/public root /srv/ext/storage/public
} }
} }

View File

@ -11,14 +11,14 @@ services:
mode: host mode: host
volumes: volumes:
- type: bind - type: bind
source: /srv source: /srv/ext
target: /srv target: /srv/ext
read_only: true read_only: true
- type: bind - type: bind
source: /srv/sys/caddy source: /srv/ext/sys/caddy
target: /data/caddy target: /data/caddy
- type: bind - type: bind
source: /srv/storage/www source: /srv/ext/sys/www
target: /www target: /www
read_only: true read_only: true
configs: configs:
@ -43,9 +43,10 @@ services:
environment: environment:
TZ: US/Mountain TZ: US/Mountain
VERSION: public VERSION: public
PLEX_CLAIM: claim-jp4-HfTyRzCce4WzUdj5
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/plex source: /srv/ext/sys/plex
target: /config target: /config
- type: bind - type: bind
source: /srv source: /srv
@ -58,11 +59,11 @@ services:
image: lscr.io/linuxserver/transmission image: lscr.io/linuxserver/transmission
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/transmission source: /srv/ext/sys/transmission
target: /config target: /config
- type: bind - type: bind
source: /srv/incoming source: /srv/ext/incoming
target: /srv/incoming target: /srv/ext/incoming
networks: networks:
- hostnet - hostnet
@ -70,69 +71,66 @@ services:
image: lscr.io/linuxserver/sonarr image: lscr.io/linuxserver/sonarr
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/sonarr source: /srv/ext/sys/sonarr
target: /config target: /config
- type: bind - type: bind
source: /srv/media/tv source: /srv/ext/media/tv
target: /srv/media/tv target: /srv/ext/media/tv
- type: bind - type: bind
source: /srv/incoming source: /srv/ext/incoming
target: /srv/incoming target: /srv/ext/incoming
radarr: radarr:
image: lscr.io/linuxserver/radarr image: lscr.io/linuxserver/radarr
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/radarr source: /srv/ext/sys/radarr
target: /config target: /config
- type: bind - type: bind
source: /srv/media/movies source: /srv/ext/media/movies
target: /srv/media/movies target: /srv/ext/media/movies
- type: bind - type: bind
source: /srv/incoming source: /srv/ext/incoming
target: /srv/incoming target: /srv/ext/incoming
lidarr: lidarr:
image: lscr.io/linuxserver/lidarr image: lscr.io/linuxserver/lidarr
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/lidarr source: /srv/ext/sys/lidarr
target: /config target: /config
- type: bind - type: bind
source: /srv/media/music source: /srv/ext/media/music
target: /srv/media/music target: /srv/ext/media/music
- type: bind - type: bind
source: /srv/incoming source: /srv/ext/incoming
target: /srv/incoming target: /srv/ext/incoming
readarr: readarr:
image: lscr.io/linuxserver/readarr:develop image: lscr.io/linuxserver/readarr:develop
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/readarr source: /srv/ext/sys/readarr
target: /config target: /config
- type: bind - type: bind
source: /srv/media/books source: /srv/ext/media/books
target: /srv/media/books target: /srv/ext/media/books
- type: bind - type: bind
source: /srv/media/audiobooks source: /srv/ext/incoming
target: /srv/media/audiobooks target: /srv/ext/incoming
- type: bind
source: /srv/incoming
target: /srv/incoming
prowlarr: prowlarr:
image: lscr.io/linuxserver/prowlarr:develop image: lscr.io/linuxserver/prowlarr:develop
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/prowlarr source: /srv/ext/sys/prowlarr
target: /config target: /config
nzbget: nzbget:
image: lscr.io/linuxserver/nzbget image: lscr.io/linuxserver/nzbget
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/nzbget source: /srv/ext/sys/nzbget
target: /config target: /config
- type: bind - type: bind
source: /srv/incoming source: /srv/ext/incoming
target: /srv/incoming target: /srv/ext/incoming
gitea: gitea:
image: gitea/gitea:1 image: gitea/gitea:1
@ -141,7 +139,7 @@ services:
USER_GID: 1000 USER_GID: 1000
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/gitea source: /srv/ext/sys/gitea
target: /data target: /data
- type: bind - type: bind
source: /etc/timezone source: /etc/timezone
@ -156,38 +154,38 @@ services:
image: git.woozle.org/neale/wallart-server image: git.woozle.org/neale/wallart-server
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/wallart source: /srv/ext/sys/wallart
target: /cache target: /cache
atlas: atlas:
image: ctassisf/ripe-atlas-alpine:arm64v8 image: ctassisf/ripe-atlas-alpine:arm64v8
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/atlas/etc source: /srv/ext/sys/atlas/etc
target: /var/atlas-probe/etc target: /var/atlas-probe/etc
- type: bind - type: bind
source: /srv/sys/atlas/status source: /srv/ext/sys/atlas/status
target: /var/atlas-probe/status target: /var/atlas-probe/status
geneweb: geneweb:
image: ravermeister/geneweb image: ravermeister/geneweb
volumes: volumes:
- type: bind - type: bind
source: /srv/sys/geneweb/etc source: /srv/ext/sys/geneweb/etc
target: /usr/local/share/geneweb/etc target: /usr/local/share/geneweb/etc
- type: bind - type: bind
source: /srv/sys/geneweb/share/data source: /srv/ext/sys/geneweb/share/data
target: /usr/local/share/geneweb/share/data target: /usr/local/share/geneweb/share/data
- type: bind - type: bind
source: /srv/sys/geneweb/log source: /srv/ext/sys/geneweb/log
target: /usr/local/share/geneweb/log target: /usr/local/share/geneweb/log
samba: samba:
image: dperson/samba image: dperson/samba
volumes: volumes:
- type: bind - type: bind
source: /srv source: /srv/ext
target: /srv target: /srv/ext
bind: bind:
propagation: rslave propagation: rslave
environment: environment:
@ -196,8 +194,8 @@ services:
USERID: 911 USERID: 911
GROUPID: 911 GROUPID: 911
# name;path;browse;readonly;guest # name;path;browse;readonly;guest
SHARE1: drive;/srv;yes;no;no SHARE1: drive;/srv/ext;yes;no;no
SHARE2: retropie;/srv/media/games/retropie;yes;yes;yes SHARE2: retropie;/srv/ext/media/games/retropie;yes;yes;yes
env_file: env_file:
- secrets/samba-users.env - secrets/samba-users.env
ports: ports:
@ -210,7 +208,7 @@ services:
image: micromata/dave image: micromata/dave
volumes: volumes:
- type: bind - type: bind
source: /srv source: /srv/ext
target: /data target: /data
configs: configs:
- source: dave.yaml - source: dave.yaml
@ -223,7 +221,7 @@ configs:
name: dave.yaml-v3 name: dave.yaml-v3
Caddyfile: Caddyfile:
file: Caddyfile file: Caddyfile
name: Caddyfile-v63 name: Caddyfile-v57
secrets: secrets: