Change folder layout

bootstrap.docker-compose.yml

@@ -29,8 +29,14 @@ services:
     volumes:
       - traefik_dynamic_config:/etc/traefik/dynamic/:ro
     configs:
-      - source: traefik_config
+      - source: traefik_static
         target: /etc/traefik/traefik.yml
+      - source: traefik_dynamic
+        target: /etc/traefik/dynamic/traefik.yml
+      - source: traefik_tls
+        target: /etc/traefik/dynamic/tls.yml
+      - source: traefik_hsts
+        target: /etc/traefik/dynamic/hsts.yml
     secrets:
       - traefik_password # TODO: Replace with SSO
       - traefik_tls_cert
@@ -82,27 +88,26 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/portainer/volumes/data/
-    labels:
-      nas-compose.boostrap: true
-  traefik_dynamic_config:
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_SERVICES?}/traefik/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/portainer/data/
     labels:
       nas-compose.boostrap: true
 
 configs:
-  traefik_config:
-    file: ${NASCOMPOSE_SERVICES?}/traefik/configs/traefik.yml
+  traefik_static:
+    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/traefik.yml
+  traefik_dynamic:
+    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/dynamic/traefik.yml
+  traefik_tls:
+    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/dynamic/tls.yml
+  traefik_hsts:
+    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/dynamic/hsts.yml
 
 secrets:
   traefik_password:
-    file: ${NASCOMPOSE_SERVICES?}/traefik/secrets/htpasswd
+    file: ${NASCOMPOSE_SERVICES?}/secrets/traefik/htpasswd
   traefik_tls_cert:
-    file: ${NASCOMPOSE_SERVICES?}/traefik/secrets/traefik.cert
+    file: ${NASCOMPOSE_SERVICES?}/secrets/traefik/traefik.cert
   traefik_tls_key:
-    file: ${NASCOMPOSE_SERVICES?}/traefik/secrets/traefik.key
+    file: ${NASCOMPOSE_SERVICES?}/secrets/traefik/traefik.key
   portainer_password:
-    file: ${NASCOMPOSE_SERVICES?}/portainer/secrets/portainer_password
+    file: ${NASCOMPOSE_SERVICES?}/secrets/portainer/portainer_password

collectors.docker-compose.yml

@@ -112,29 +112,29 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/mylar/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/mylar/config/
   lazylibrarian_config:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/lazylibrarian/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/lazylibrarian/config/
   sonarr_config:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/sonarr/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/sonarr/config/
   radarr_config:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/radarr/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/radarr/config/
   bazarr_config:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/bazarr/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/bazarr/config/
   ombi_config:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/ombi/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/ombi/config/

docker/.gitignore

@@ -0,0 +1,4 @@
+secrets/*/*
+!secrets/*/README.md
+volumes/*/*/*
+!volumes/*/*/.gitkeep

downloads.docker-compose.yml

@@ -45,8 +45,10 @@ services:
       - 1.0.0.1
     volumes:
       - transmission_config:/config/
-      - transmission_scripts:/scripts/
       - torrents:/data/
+    configs:
+      - source: transmission_openvpn_post_config
+        target: /scripts/openvpn-post-config.sh
     secrets:
       - source: transmission_rpc_creds
         target: rpc_creds
@@ -98,20 +100,24 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/prowlarr/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/prowlarr/config/
   transmission_config:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/transmission/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/transmission/config/
   transmission_scripts:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/transmission/volumes/scripts/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/transmission/scripts/
+
+configs:
+  transmission_openvpn_post_config:
+    file: ${NASCOMPOSE_SERVICES?}/configs/transmission/openvpn-post-config.sh
 
 secrets:
     transmission_rpc_creds:
-        file: ${NASCOMPOSE_SERVICES?}/transmission/secrets/rpc_creds
+        file: ${NASCOMPOSE_SERVICES?}/secrets/transmission/rpc_creds
     transmission_vpn_creds:
-        file: ${NASCOMPOSE_SERVICES?}/transmission/secrets/vpn_creds
+        file: ${NASCOMPOSE_SERVICES?}/secrets/transmission/vpn_creds

media.docker-compose.yml

@@ -90,9 +90,9 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/plex/volumes/config/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/plex/config/
   plaxt_keystore:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/plaxt/volumes/keystore/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/plaxt/keystore/

notifications.docker-compose.yml

@@ -29,8 +29,8 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/gotify/volumes/data/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/gotify/data/
 
 secrets:
   gotify_admin_password:
-    file: ${NASCOMPOSE_SERVICES?}/gotify/secrets/admin_password
+    file: ${NASCOMPOSE_SERVICES?}/secrets/gotify/admin_password

services/.gitignore

@@ -1,6 +0,0 @@
-*/volumes/*/*
-!*/volumes/*/README.md
-!*/volumes/*/.gitkeep
-*/secrets/*
-!*/secrets/README.md
-!.gitignore

services/gotify/volumes/data/.gitignore

@@ -1 +0,0 @@
-!entrypoint.sh

services/traefik/volumes/config/.gitignore

@@ -1 +0,0 @@
-!*

services/transmission/secrets/README.md

@@ -1,7 +0,0 @@
-Contains the file `openvpn_creads`
-
-Credentials to connect to openvpn
-
-Contains the file `rpc_creads`
-
-Credentials to connect to transmission

services/transmission/volumes/scripts/.gitignore

@@ -1,7 +0,0 @@
-!/openvpn-pre-start.sh
-!/openvpn-post-config.sh
-!/transmission-pre-start.sh
-!/transmission-post-start.sh
-!/routes-post-start.sh
-!/transmission-pre-stop.sh
-!/transmission-post-stop.sh

services/watchtower/secrets/README.md

@@ -1,2 +0,0 @@
-Contains the file `gotify_token`
-More on https://crazymax.dev/diun/notif/gotify/

utilities.docker-compose.yml

@@ -53,34 +53,15 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/smokeping/volumes/data/
+      device: ${NASCOMPOSE_SERVICES?}/volumes/smokeping/data/
   smokeping_config:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/smokeping/volumes/config/
-  ddclient_data:
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_SERVICES?}/ddclient/volumes/data/
-  ddclient_config:
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_SERVICES?}/ddclient/volumes/config/
-  ddclient_init:
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_SERVICES?}/ddclient/volumes/init/
-
-configs:
-  ddclient_config_tpl:
-    file: ${NASCOMPOSE_SERVICES?}/ddclient/configs/ddclient.conf.tpl
+      device: ${NASCOMPOSE_SERVICES?}/volumes/smokeping/config/
 
 secrets:
   watchtower_gotify_token:
-    file: ${NASCOMPOSE_SERVICES?}/watchtower/secrets/gotify_token
+    file: ${NASCOMPOSE_SERVICES?}/secrets/watchtower/gotify_token
   duckdns_token:
-    file: ${NASCOMPOSE_SERVICES?}/ddclient/secrets/duckdns_token
+    file: ${NASCOMPOSE_SERVICES?}/secrets/duckdns/duckdns_token