From 9fec9efcb1e63534c43a572c3fa941da36f3fa1d Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Sun, 24 Dec 2023 20:00:17 +0100 Subject: [PATCH] Removed default values --- roles/docker-openproject/templates/docker-compose.yml.j2 | 6 +++--- roles/docker-openproject/templates/env.j2 | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/docker-openproject/templates/docker-compose.yml.j2 b/roles/docker-openproject/templates/docker-compose.yml.j2 index ebc2193d..4380a345 100644 --- a/roles/docker-openproject/templates/docker-compose.yml.j2 +++ b/roles/docker-openproject/templates/docker-compose.yml.j2 @@ -27,7 +27,7 @@ x-op-app: &app # set to true to enable the email receiving feature. See ./docker/cron for more options IMAP_ENABLED: "${IMAP_ENABLED:-false}" volumes: - - "${OPDATA:-opdata}:/var/openproject/assets" + - "${OPDATA}:/var/openproject/assets" services: db: @@ -35,9 +35,9 @@ services: <<: *restart_policy stop_grace_period: "3s" volumes: - - "${PGDATA:-pgdata}:/var/lib/postgresql/data" + - "${PGDATA}:/var/lib/postgresql/data" environment: - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-p4ssw0rd} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: openproject networks: - backend diff --git a/roles/docker-openproject/templates/env.j2 b/roles/docker-openproject/templates/env.j2 index 7c4e79b5..d1b77b44 100644 --- a/roles/docker-openproject/templates/env.j2 +++ b/roles/docker-openproject/templates/env.j2 @@ -17,6 +17,5 @@ DATABASE_URL="postgres://postgres:{{ openproject_database_password }}@db/openpro RAILS_MIN_THREADS=4 RAILS_MAX_THREADS=16 -# The following volumes are default PGDATA="pgdata" OPDATA="opdata" \ No newline at end of file