Adopt new hierarchy pattern

bootstrap.docker-compose.yml

@@ -22,8 +22,8 @@ services:
       - traefik
       - docker
     configs:
-      - source: traefik
+      - source: traefik_config
-        target: /etc/traefik/
+        target: /etc/traefik/traefik.yml
     depends_on:
       - docker
     restart: unless-stopped
@@ -40,7 +40,7 @@ services:
       - docker
       - traefik
     volumes:
-      - portainer_data:/data
+      - portainer_data:/data/
     secrets:
       - portainer_password
     depends_on:
@@ -68,13 +68,13 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${MOUNT_DIR?}/portainer/data/
+      device: ${MOUNT_DIR?}/portainer/volumes/data/
     labels:
       nas-compose.boostrap: true
 
 configs:
-  traefik:
+  traefik_config:
-    file: ${MOUNT_DIR?}/traefik/config/
+    file: ${MOUNT_DIR?}/traefik/configs/traefik.yml
 
 secrets:
   portainer_password:

mounts/.gitignore

@@ -1,5 +0,0 @@
-*/data/*
-!*/data/README.md
-*/secrets/*
-!*/secrets/README.md
-!.gitignore

notifications.docker-compose.yml

@@ -10,9 +10,9 @@ services:
       - gotify
       - traefik
     volumes:
-      - gotify_data:/app/data
+      - gotify_data:/app/data/
     secrets:
-      - admin_password
+      - gotify_admin_password
     restart: unless-stopped
     labels:
       traefik.enable: true
@@ -29,8 +29,8 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${MOUNT_DIR?}/gotify/data/
+      device: ${MOUNT_DIR?}/gotify/volumes/data/
 
 secrets:
-  admin_password:
+  gotify_admin_password:
     file: ${MOUNT_DIR?}/gotify/secrets/admin_password

services/.gitignore

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

services/ddclient/volumes/data/.gitignore

@@ -1,2 +1 @@
-!entrypoint.sh
 !postscript_gotify.sh

services/ddclient/volumes/init/.gitignore

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

utilities.docker-compose.yml

@@ -22,7 +22,7 @@ services:
     networks:
       - traefik
     volumes:
-      - smokeping_data:/data
+      - smokeping_data:/data/
     #configs:
     #  - source: smokeping
     #    target: /config/
@@ -42,8 +42,8 @@ services:
     networks:
       - gotify
     volumes:
-      - ddclient_data:/data
+      - ddclient_data:/data/
-      - ddclient_init:/custom-cont-init.d:ro
+      - ddclient_init:/custom-cont-init.d/:ro
     configs:
       - source: ddclient_config
         target: /config/
@@ -67,23 +67,23 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${MOUNT_DIR?}/smokeping/data/
+      device: ${MOUNT_DIR?}/smokeping/volumes/data/
   ddclient_data:
     driver_opts:
       type: none
       o: bind
-      device: ${MOUNT_DIR?}/ddclient/data/
+      device: ${MOUNT_DIR?}/ddclient/volumes/data/
   ddclient_init:
     driver_opts:
       type: none
       o: bind
-      device: ${MOUNT_DIR?}/ddclient/cont-init/
+      device: ${MOUNT_DIR?}/ddclient/volumes/init/
 
 configs:
 #  smokeping:
 #    file: ${MOUNT_DIR?}/smokeping/config/
   ddclient_config:
-    file: ${MOUNT_DIR?}/ddclient/config/
+    file: ${MOUNT_DIR?}/ddclient/configs/ddclient.conf.tpl
 
 secrets:
   watchtower_gotify_token: