diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml index 4ad559f..6c69a41 100644 --- a/bootstrap.docker-compose.yml +++ b/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 diff --git a/collectors.docker-compose.yml b/collectors.docker-compose.yml index daebfc1..66f57bf 100644 --- a/collectors.docker-compose.yml +++ b/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/ diff --git a/docker/.gitignore b/docker/.gitignore new file mode 100644 index 0000000..d9bfd22 --- /dev/null +++ b/docker/.gitignore @@ -0,0 +1,4 @@ +secrets/*/* +!secrets/*/README.md +volumes/*/*/* +!volumes/*/*/.gitkeep \ No newline at end of file diff --git a/services/traefik/volumes/config/hsts.yml b/docker/configs/traefik/dynamic/hsts.yml similarity index 100% rename from services/traefik/volumes/config/hsts.yml rename to docker/configs/traefik/dynamic/hsts.yml diff --git a/services/traefik/volumes/config/tls.yml b/docker/configs/traefik/dynamic/tls.yml similarity index 100% rename from services/traefik/volumes/config/tls.yml rename to docker/configs/traefik/dynamic/tls.yml diff --git a/services/traefik/volumes/config/traefik.yml b/docker/configs/traefik/dynamic/traefik.yml similarity index 100% rename from services/traefik/volumes/config/traefik.yml rename to docker/configs/traefik/dynamic/traefik.yml diff --git a/services/traefik/configs/traefik.yml b/docker/configs/traefik/traefik.yml similarity index 100% rename from services/traefik/configs/traefik.yml rename to docker/configs/traefik/traefik.yml diff --git a/services/transmission/volumes/scripts/openvpn-post-config.sh b/docker/configs/transmission/openvpn-post-config.sh similarity index 100% rename from services/transmission/volumes/scripts/openvpn-post-config.sh rename to docker/configs/transmission/openvpn-post-config.sh diff --git a/services/duckdns/secrets/README.md b/docker/secrets/duckdns/README.md similarity index 100% rename from services/duckdns/secrets/README.md rename to docker/secrets/duckdns/README.md diff --git a/services/gotify/secrets/README.md b/docker/secrets/gotify/README.md similarity index 100% rename from services/gotify/secrets/README.md rename to docker/secrets/gotify/README.md diff --git a/services/portainer/secrets/README.md b/docker/secrets/portainer/README.md similarity index 100% rename from services/portainer/secrets/README.md rename to docker/secrets/portainer/README.md diff --git a/services/traefik/secrets/README.md b/docker/secrets/traefik/README.md similarity index 100% rename from services/traefik/secrets/README.md rename to docker/secrets/traefik/README.md diff --git a/services/bazarr/volumes/config/.gitkeep b/docker/volumes/bazaar/config/.gitkeep similarity index 100% rename from services/bazarr/volumes/config/.gitkeep rename to docker/volumes/bazaar/config/.gitkeep diff --git a/services/gotify/volumes/data/entrypoint.sh b/docker/volumes/gotify/data/entrypoint.sh similarity index 100% rename from services/gotify/volumes/data/entrypoint.sh rename to docker/volumes/gotify/data/entrypoint.sh diff --git a/services/lazylibrarian/volumes/config/.gitkeep b/docker/volumes/lazylibrarian/config/.gitkeep similarity index 100% rename from services/lazylibrarian/volumes/config/.gitkeep rename to docker/volumes/lazylibrarian/config/.gitkeep diff --git a/services/mylar/volumes/config/.gitkeep b/docker/volumes/mylar/config/.gitkeep similarity index 100% rename from services/mylar/volumes/config/.gitkeep rename to docker/volumes/mylar/config/.gitkeep diff --git a/services/ombi/volumes/config/.gitkeep b/docker/volumes/ombi/config/.gitkeep similarity index 100% rename from services/ombi/volumes/config/.gitkeep rename to docker/volumes/ombi/config/.gitkeep diff --git a/services/plaxt/volumes/keystore/.gitkeep b/docker/volumes/plaxt/keystore/.gitkeep similarity index 100% rename from services/plaxt/volumes/keystore/.gitkeep rename to docker/volumes/plaxt/keystore/.gitkeep diff --git a/services/plex/volumes/data/.gitkeep b/docker/volumes/plex/data/.gitkeep similarity index 100% rename from services/plex/volumes/data/.gitkeep rename to docker/volumes/plex/data/.gitkeep diff --git a/services/portainer/volumes/data/.gitkeep b/docker/volumes/portainer/data/.gitkeep similarity index 100% rename from services/portainer/volumes/data/.gitkeep rename to docker/volumes/portainer/data/.gitkeep diff --git a/services/prowlarr/volumes/config/.gitkeep b/docker/volumes/prowlarr/config/.gitkeep similarity index 100% rename from services/prowlarr/volumes/config/.gitkeep rename to docker/volumes/prowlarr/config/.gitkeep diff --git a/services/radarr/volumes/config/.gitkeep b/docker/volumes/radarr/config/.gitkeep similarity index 100% rename from services/radarr/volumes/config/.gitkeep rename to docker/volumes/radarr/config/.gitkeep diff --git a/services/smokeping/volumes/config/.gitkeep b/docker/volumes/smokeping/config/.gitkeep similarity index 100% rename from services/smokeping/volumes/config/.gitkeep rename to docker/volumes/smokeping/config/.gitkeep diff --git a/services/smokeping/volumes/data/.gitkeep b/docker/volumes/smokeping/data/.gitkeep similarity index 100% rename from services/smokeping/volumes/data/.gitkeep rename to docker/volumes/smokeping/data/.gitkeep diff --git a/services/sonarr/volumes/config/.gitkeep b/docker/volumes/sonarr/config/.gitkeep similarity index 100% rename from services/sonarr/volumes/config/.gitkeep rename to docker/volumes/sonarr/config/.gitkeep diff --git a/services/transmission/volumes/config/.gitkeep b/docker/volumes/transmission/config/.gitkeep similarity index 100% rename from services/transmission/volumes/config/.gitkeep rename to docker/volumes/transmission/config/.gitkeep diff --git a/downloads.docker-compose.yml b/downloads.docker-compose.yml index c5be8dc..eea07ad 100644 --- a/downloads.docker-compose.yml +++ b/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 diff --git a/media.docker-compose.yml b/media.docker-compose.yml index 8fda59c..b7af760 100644 --- a/media.docker-compose.yml +++ b/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/ diff --git a/notifications.docker-compose.yml b/notifications.docker-compose.yml index 9e5c6e8..cb277ed 100644 --- a/notifications.docker-compose.yml +++ b/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 diff --git a/services/.gitignore b/services/.gitignore deleted file mode 100644 index e5429ae..0000000 --- a/services/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*/volumes/*/* -!*/volumes/*/README.md -!*/volumes/*/.gitkeep -*/secrets/* -!*/secrets/README.md -!.gitignore diff --git a/services/gotify/volumes/data/.gitignore b/services/gotify/volumes/data/.gitignore deleted file mode 100644 index 260859d..0000000 --- a/services/gotify/volumes/data/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!entrypoint.sh \ No newline at end of file diff --git a/services/traefik/volumes/config/.gitignore b/services/traefik/volumes/config/.gitignore deleted file mode 100644 index 74e5b1d..0000000 --- a/services/traefik/volumes/config/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!* \ No newline at end of file diff --git a/services/transmission/secrets/README.md b/services/transmission/secrets/README.md deleted file mode 100644 index c6fb290..0000000 --- a/services/transmission/secrets/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Contains the file `openvpn_creads` - -Credentials to connect to openvpn - -Contains the file `rpc_creads` - -Credentials to connect to transmission diff --git a/services/transmission/volumes/scripts/.gitignore b/services/transmission/volumes/scripts/.gitignore deleted file mode 100644 index 566c2d0..0000000 --- a/services/transmission/volumes/scripts/.gitignore +++ /dev/null @@ -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 diff --git a/services/watchtower/secrets/README.md b/services/watchtower/secrets/README.md deleted file mode 100644 index f79ce96..0000000 --- a/services/watchtower/secrets/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Contains the file `gotify_token` -More on https://crazymax.dev/diun/notif/gotify/ diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml index 914ea10..771ed1c 100644 --- a/utilities.docker-compose.yml +++ b/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