fill for other collections

docker-compose.dem.yml

@@ -43,6 +43,7 @@ services:
       - env/dem_obs.env
     secrets:
       - DJANGO_PASSWORD
+      - OS_PASSWORD      
     environment:
       INSTANCE_ID: "prism-view-server_renderer"
       INSTALL_DIR: "/var/www/pvs/dev/"
@@ -50,6 +51,7 @@ services:
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "database:5432"
       DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
+      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
     configs:
       - source: init-db
         target: /init-db.sh
@@ -70,14 +72,12 @@ services:
       - env/dem_obs.env
     secrets:
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_cache"
       RENDERER_HOST: renderer
       WAIT_SERVICES: "database:5432 renderer:80"
       WAIT_TIMEOUT: 300  # wait up to 5 minutes
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
     deploy:
       replicas: 1
     networks:
@@ -95,13 +95,11 @@ services:
       - env/dem_redis.env
     secrets:
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_seeder"
       RENDERER_HOST: renderer
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
     deploy:
       replicas: 0
     networks:
@@ -148,8 +146,8 @@ services:
       - env/dem_obs.env
       - env/dem_redis.env
     secrets:
+      - DJANGO_PASSWORD
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_registrar"
       INSTALL_DIR: "/var/www/pvs/dev/"
@@ -157,7 +155,7 @@ services:
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
+      DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
       REPORTING_DIR: "/mnt/reports/"
     configs:
       - source: init-db

docker-compose.vhr18.yml

@@ -43,6 +43,7 @@ services:
       - env/vhr18_obs.env
     secrets:
       - DJANGO_PASSWORD
+      - OS_PASSWORD
     environment:
       INSTANCE_ID: "prism-view-server_renderer"
       INSTALL_DIR: "/var/www/pvs/dev/"
@@ -50,6 +51,7 @@ services:
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "database:5432"
       DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
+      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
     configs:
       - source: init-db
         target: /init-db.sh
@@ -70,14 +72,12 @@ services:
       - env/vhr18_obs.env
     secrets:
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_cache"
       RENDERER_HOST: renderer
       WAIT_SERVICES: "database:5432 renderer:80"
       WAIT_TIMEOUT: 300  # wait up to 5 minutes
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
     deploy:
       replicas: 1
     logging:
@@ -98,13 +98,11 @@ services:
       - env/vhr18_redis.env
     secrets:
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_seeder"
       RENDERER_HOST: renderer
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
     deploy:
       replicas: 0
     networks:
@@ -161,8 +159,8 @@ services:
       - env/vhr18_obs.env
       - env/vhr18_redis.env
     secrets:
+      - DJANGO_PASSWORD      
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_registrar"
       INSTALL_DIR: "/var/www/pvs/dev/"
@@ -170,7 +168,7 @@ services:
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
+      DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
       REPORTING_DIR: "/mnt/reports/"
     configs:
       - source: init-db

documentation/operator-guide/configuration.rst

@@ -104,7 +104,6 @@ Environment variables and ``.env`` files are passed to the services via the
         STARTUP_SCRIPTS: "/wait-initialized.sh"
         WAIT_SERVICES: "redis:6379 database:5432"
         OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-        OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
       # ...
 
 ``.env`` Files