diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml index a600f53..56eca3c 100644 --- a/bootstrap.docker-compose.yml +++ b/bootstrap.docker-compose.yml @@ -24,7 +24,7 @@ services: - docker - macvlan environment: - - NAS_COMPOSE_DOMAIN=${NAS_COMPOSE_DOMAIN?} + - NASCOMPOSE_DOMAIN=${NASCOMPOSE_DOMAIN?} # TODO: Move to configs? volumes: - traefik_dynamic_config:/etc/traefik/dynamic/:ro @@ -80,27 +80,27 @@ volumes: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/portainer/volumes/data/ + device: ${NASCOMPOSE_SERVICES?}/portainer/volumes/data/ labels: nas-compose.boostrap: true traefik_dynamic_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/traefik/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/traefik/volumes/config/ labels: nas-compose.boostrap: true configs: traefik_config: - file: ${SERVICES_DIR?}/traefik/configs/traefik.yml + file: ${NASCOMPOSE_SERVICES?}/traefik/configs/traefik.yml secrets: traefik_password: - file: ${SERVICES_DIR?}/traefik/secrets/htpasswd + file: ${NASCOMPOSE_SERVICES?}/traefik/secrets/htpasswd traefik_tls_cert: - file: ${SERVICES_DIR?}/traefik/secrets/traefik.cert + file: ${NASCOMPOSE_SERVICES?}/traefik/secrets/traefik.cert traefik_tls_key: - file: ${SERVICES_DIR?}/traefik/secrets/traefik.key + file: ${NASCOMPOSE_SERVICES?}/traefik/secrets/traefik.key portainer_password: - file: ${SERVICES_DIR?}/portainer/secrets/portainer_password + file: ${NASCOMPOSE_SERVICES?}/portainer/secrets/portainer_password diff --git a/collectors.docker-compose.yml b/collectors.docker-compose.yml index 47691fa..daebfc1 100644 --- a/collectors.docker-compose.yml +++ b/collectors.docker-compose.yml @@ -112,29 +112,29 @@ volumes: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/mylar/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/mylar/volumes/config/ lazylibrarian_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/lazylibrarian/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/lazylibrarian/volumes/config/ sonarr_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/sonarr/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/sonarr/volumes/config/ radarr_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/radarr/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/radarr/volumes/config/ bazarr_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/bazarr/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/bazarr/volumes/config/ ombi_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/ombi/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/ombi/volumes/config/ diff --git a/docs/bootstrap.md b/docs/bootstrap.md index b3e7c68..789a367 100644 --- a/docs/bootstrap.md +++ b/docs/bootstrap.md @@ -24,7 +24,7 @@ docker run --rm -p 9443:9443 -v /var/run/docker.sock:/var/run/docker.sock portai ``` ### Environment variables -- `SERVICES_DIR`: Absolute path to the `services` folder +- `NASCOMPOSE_SERVICES`: Absolute path to the `services` folder ## Docker [`alpine/socat`](https://hub.docker.com/r/alpine/socat/) exposes the docker socket as a port. diff --git a/downloads.docker-compose.yml b/downloads.docker-compose.yml index 109a910..0c34e2c 100644 --- a/downloads.docker-compose.yml +++ b/downloads.docker-compose.yml @@ -75,43 +75,43 @@ volumes: driver_opts: type: none o: bind - device: ${DOWNLOADS_DIR?}/torrents/completed + device: ${NASCOMPOSE_DOWNLOADS?}/torrents/completed usenet_completed: name: usenet_completed driver_opts: type: none o: bind - device: ${DOWNLOADS_DIR?}/usenet/completed + device: ${NASCOMPOSE_DOWNLOADS?}/usenet/completed torrents: driver_opts: type: none o: bind - device: ${DOWNLOADS_DIR?}/torrents + device: ${NASCOMPOSE_DOWNLOADS?}/torrents usenet: driver_opts: type: none o: bind - device: ${DOWNLOADS_DIR?}/usenet + device: ${NASCOMPOSE_DOWNLOADS?}/usenet prowlarr_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/prowlarr/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/prowlarr/volumes/config/ transmission_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/transmission/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/transmission/volumes/config/ transmission_scripts: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/transmission/volumes/scripts/ + device: ${NASCOMPOSE_SERVICES?}/transmission/volumes/scripts/ secrets: transmission_rpc_creds: - file: ${SERVICES_DIR?}/transmission/secrets/rpc_creds + file: ${NASCOMPOSE_SERVICES?}/transmission/secrets/rpc_creds transmission_vpn_creds: - file: ${SERVICES_DIR?}/transmission/secrets/vpn_creds + file: ${NASCOMPOSE_SERVICES?}/transmission/secrets/vpn_creds diff --git a/media.docker-compose.yml b/media.docker-compose.yml index 36c7d46..9973328 100644 --- a/media.docker-compose.yml +++ b/media.docker-compose.yml @@ -57,39 +57,39 @@ volumes: driver_opts: type: none o: bind - device: ${MEDIA_DIR?}/books/ + device: ${NASCOMPOSE_MEDIA?}/books/ comics: name: comics driver_opts: type: none o: bind - device: ${MEDIA_DIR?}/comics/ + device: ${NASCOMPOSE_MEDIA?}/comics/ movies: name: movies driver_opts: type: none o: bind - device: ${MEDIA_DIR?}/movies/ + device: ${NASCOMPOSE_MEDIA?}/movies/ tv: name: tv driver_opts: type: none o: bind - device: ${MEDIA_DIR?}/tv/ + device: ${NASCOMPOSE_MEDIA?}/tv/ recycle_bin: name: recycle_bin driver_opts: type: none o: bind - device: ${MEDIA_DIR?}/recycle_bin/ + device: ${NASCOMPOSE_MEDIA?}/recycle_bin/ plex_data: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/plex/volumes/data/ + device: ${NASCOMPOSE_SERVICES?}/plex/volumes/data/ plaxt_keystore: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/plaxt/volumes/keystore/ + device: ${NASCOMPOSE_SERVICES?}/plaxt/volumes/keystore/ diff --git a/nas-compose.env b/nas-compose.env index 7d9bc5a..cbeada0 100644 --- a/nas-compose.env +++ b/nas-compose.env @@ -1,8 +1,8 @@ -NAS_COMPOSE_DOMAIN= -DUCK_DNS_DOMAIN= +NASCOMPOSE_DOMAIN= +NASCOMPOSE_DUCKDNS= COMPOSE_PROFILES=ebooks,plaxt,ombi -SERVICES_DIR= -DOWNLOADS_DIR= -MEDIA_DIR= +NASCOMPOSE_SERVICES= +NASCOMPOSE_DOWNLOADS= +NASCOMPOSE_MEDIA= diff --git a/notifications.docker-compose.yml b/notifications.docker-compose.yml index 3044af2..9e5c6e8 100644 --- a/notifications.docker-compose.yml +++ b/notifications.docker-compose.yml @@ -29,8 +29,8 @@ volumes: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/gotify/volumes/data/ + device: ${NASCOMPOSE_SERVICES?}/gotify/volumes/data/ secrets: gotify_admin_password: - file: ${SERVICES_DIR?}/gotify/secrets/admin_password + file: ${NASCOMPOSE_SERVICES?}/gotify/secrets/admin_password diff --git a/services/traefik/configs/traefik.yml b/services/traefik/configs/traefik.yml index 06136f6..ea6ead3 100644 --- a/services/traefik/configs/traefik.yml +++ b/services/traefik/configs/traefik.yml @@ -3,7 +3,7 @@ providers: endpoint: tcp://docker:2375 exposedByDefault: false network: traefik - defaultRule: Host(`{{ index .Labels "com.docker.compose.service" }}.{{ env `NAS_COMPOSE_DOMAIN` }}`) + defaultRule: Host(`{{ index .Labels "com.docker.compose.service" }}.{{ env `NASCOMPOSE_DOMAIN` }}`) file: directory: /etc/traefik/dynamic/ diff --git a/services/traefik/volumes/config/traefik.yml b/services/traefik/volumes/config/traefik.yml index d084561..24a6c1d 100644 --- a/services/traefik/volumes/config/traefik.yml +++ b/services/traefik/volumes/config/traefik.yml @@ -1,7 +1,7 @@ http: routers: traefik: - rule: Host(`traefik.{{ env `NAS_COMPOSE_DOMAIN` }}`) + rule: Host(`traefik.{{ env `NASCOMPOSE_DOMAIN` }}`) service: api@internal middlewares: - traefik-auth diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml index af3ee07..ee78a77 100644 --- a/utilities.docker-compose.yml +++ b/utilities.docker-compose.yml @@ -31,7 +31,7 @@ services: duckdns: image: linuxserver/duckdns environment: - - SUBDOMAINS=${DUCK_DNS_DOMAIN?} + - SUBDOMAINS=${NASCOMPOSE_DUCKDNS?} - FILE__TOKEN=/run/secrets/duckdns_token secrets: - duckdns_token @@ -50,34 +50,34 @@ volumes: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/smokeping/volumes/data/ + device: ${NASCOMPOSE_SERVICES?}/smokeping/volumes/data/ smokeping_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/smokeping/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/smokeping/volumes/config/ ddclient_data: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/ddclient/volumes/data/ + device: ${NASCOMPOSE_SERVICES?}/ddclient/volumes/data/ ddclient_config: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/ddclient/volumes/config/ + device: ${NASCOMPOSE_SERVICES?}/ddclient/volumes/config/ ddclient_init: driver_opts: type: none o: bind - device: ${SERVICES_DIR?}/ddclient/volumes/init/ + device: ${NASCOMPOSE_SERVICES?}/ddclient/volumes/init/ configs: ddclient_config_tpl: - file: ${SERVICES_DIR?}/ddclient/configs/ddclient.conf.tpl + file: ${NASCOMPOSE_SERVICES?}/ddclient/configs/ddclient.conf.tpl secrets: watchtower_gotify_token: - file: ${SERVICES_DIR?}/watchtower/secrets/gotify_token + file: ${NASCOMPOSE_SERVICES?}/watchtower/secrets/gotify_token duckdns_token: - file: ${SERVICES_DIR?}/ddclient/secrets/duckdns_token + file: ${NASCOMPOSE_SERVICES?}/ddclient/secrets/duckdns_token