Moved /srv/ext to /srv

homelab/Caddyfile

@@ -23,8 +23,8 @@ drive.woozle.org {
   # route overrides built-in ordering
   route {
     file_server @nondav {
-      root /srv/ext/
+      root /srv/
-      browse /www/browse.html
+      browse
     }
     reverse_proxy webdav:8000
   }
@@ -41,11 +41,6 @@ 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
@@ -107,7 +102,7 @@ deergrove.woozle.org, sweetums.woozle.org {
 
   handle_path /public/* {
     file_server {
-      root /srv/ext/storage/public
+      root /srv/storage/public
     }
   }
 

homelab/docker-compose.yaml

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