diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml index cb1bb34..62dff88 100644 --- a/bootstrap.docker-compose.yml +++ b/bootstrap.docker-compose.yml @@ -22,8 +22,8 @@ services: - traefik - docker configs: - - source: traefik - target: /etc/traefik/ + - source: traefik_config + 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: - file: ${MOUNT_DIR?}/traefik/config/ + traefik_config: + file: ${MOUNT_DIR?}/traefik/configs/traefik.yml secrets: portainer_password: diff --git a/mounts/.gitignore b/mounts/.gitignore deleted file mode 100644 index 9c53395..0000000 --- a/mounts/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*/data/* -!*/data/README.md -*/secrets/* -!*/secrets/README.md -!.gitignore diff --git a/mounts/portainer/data/README.md b/mounts/portainer/data/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/mounts/smokeping/data/README.md b/mounts/smokeping/data/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/notifications.docker-compose.yml b/notifications.docker-compose.yml index 63473fe..b55b67b 100644 --- a/notifications.docker-compose.yml +++ b/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 diff --git a/services/.gitignore b/services/.gitignore new file mode 100644 index 0000000..e5429ae --- /dev/null +++ b/services/.gitignore @@ -0,0 +1,6 @@ +*/volumes/*/* +!*/volumes/*/README.md +!*/volumes/*/.gitkeep +*/secrets/* +!*/secrets/README.md +!.gitignore diff --git a/mounts/ddclient/config/ddclient.conf.tpl b/services/ddclient/configs/ddclient.conf.tpl similarity index 100% rename from mounts/ddclient/config/ddclient.conf.tpl rename to services/ddclient/configs/ddclient.conf.tpl diff --git a/mounts/ddclient/secrets/README.md b/services/ddclient/secrets/README.md similarity index 100% rename from mounts/ddclient/secrets/README.md rename to services/ddclient/secrets/README.md diff --git a/mounts/ddclient/data/.gitignore b/services/ddclient/volumes/data/.gitignore similarity index 59% rename from mounts/ddclient/data/.gitignore rename to services/ddclient/volumes/data/.gitignore index 970b98f..07b2f6d 100644 --- a/mounts/ddclient/data/.gitignore +++ b/services/ddclient/volumes/data/.gitignore @@ -1,2 +1 @@ -!entrypoint.sh !postscript_gotify.sh diff --git a/mounts/ddclient/data/postscript_gotify.sh b/services/ddclient/volumes/data/postscript_gotify.sh similarity index 100% rename from mounts/ddclient/data/postscript_gotify.sh rename to services/ddclient/volumes/data/postscript_gotify.sh diff --git a/services/ddclient/volumes/init/.gitignore b/services/ddclient/volumes/init/.gitignore new file mode 100644 index 0000000..cffd296 --- /dev/null +++ b/services/ddclient/volumes/init/.gitignore @@ -0,0 +1 @@ +!entrypoint.sh diff --git a/mounts/ddclient/cont-init/entrypoint.sh b/services/ddclient/volumes/init/entrypoint.sh similarity index 100% rename from mounts/ddclient/cont-init/entrypoint.sh rename to services/ddclient/volumes/init/entrypoint.sh diff --git a/mounts/gotify/secrets/README.md b/services/gotify/secrets/README.md similarity index 100% rename from mounts/gotify/secrets/README.md rename to services/gotify/secrets/README.md diff --git a/mounts/gotify/data/.gitignore b/services/gotify/volumes/data/.gitignore similarity index 100% rename from mounts/gotify/data/.gitignore rename to services/gotify/volumes/data/.gitignore diff --git a/mounts/gotify/data/entrypoint.sh b/services/gotify/volumes/data/entrypoint.sh similarity index 100% rename from mounts/gotify/data/entrypoint.sh rename to services/gotify/volumes/data/entrypoint.sh diff --git a/mounts/portainer/secrets/README.md b/services/portainer/secrets/README.md similarity index 100% rename from mounts/portainer/secrets/README.md rename to services/portainer/secrets/README.md diff --git a/mounts/ddclient/data/README.md b/services/portainer/volumes/data/.gitkeep similarity index 100% rename from mounts/ddclient/data/README.md rename to services/portainer/volumes/data/.gitkeep diff --git a/mounts/gotify/data/README.md b/services/smokeping/volumes/data/.gitkeep similarity index 100% rename from mounts/gotify/data/README.md rename to services/smokeping/volumes/data/.gitkeep diff --git a/mounts/traefik/config/traefik.yml b/services/traefik/configs/traefik.yml similarity index 100% rename from mounts/traefik/config/traefik.yml rename to services/traefik/configs/traefik.yml diff --git a/mounts/watchtower/secrets/README.md b/services/watchtower/secrets/README.md similarity index 100% rename from mounts/watchtower/secrets/README.md rename to services/watchtower/secrets/README.md diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml index b906c10..0d29d2e 100644 --- a/utilities.docker-compose.yml +++ b/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_init:/custom-cont-init.d:ro + - ddclient_data:/data/ + - 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: