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 {
file_server @nondav {
root /srv/
browse
root /srv/ext/
browse /www/browse.html
}
reverse_proxy webdav:8000
}
@ -41,6 +41,11 @@ ancestry.woozle.org {
##
deergrove.woozle.org, sweetums.woozle.org {
handle_path /qbittorrent/* {
import restricted-access
reverse_proxy host.docker.internal:6880
}
handle /transmission/* {
import restricted-access
reverse_proxy host.docker.internal:9091
@ -102,7 +107,7 @@ deergrove.woozle.org, sweetums.woozle.org {
handle_path /public/* {
file_server {
root /srv/storage/public
root /srv/ext/storage/public
}
}

View File

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