diff --git a/.envrc.sample b/.envrc.sample index e61bcef..c1075c0 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -24,6 +24,8 @@ export EMAIL_SENDER=foodsoft@biobulkbende.org export EMAIL_REPLY=foodsoft@biobulkbende.org export ERROR_EMAIL=systems@biobulkbende.org +# export COMPOSE_FILE="compose.yml:compose.sharedlists.yml" +export ENABLE_SHARED_LISTS=0 export SHARED_LISTS_DB_TYPE=mysql2 export SHARED_LISTS_HOST=order.voedselcollectief.org export SHARED_LISTS_DB_NAME=sharedlists diff --git a/app_config.yml.tmpl b/app_config.yml.tmpl index 04bb7a0..e06ca0e 100644 --- a/app_config.yml.tmpl +++ b/app_config.yml.tmpl @@ -142,6 +142,8 @@ default: &defaults host: "{{ env "DOMAIN" }}" #port: 3000 + + {{ if eq (env "ENABLED_SHARED_LISTS") "1" }} # Access to sharedlists, the external article-database. # This allows a foodcoop to subscribe to a selection of a supplier's full assortment, # and makes it possible to share data with several foodcoops. Using this requires installing @@ -152,6 +154,7 @@ default: &defaults database: "{{ env "SHARED_LISTS_DB_NAME" }}" username: "{{ env "SHARED_LISTS_USER" }}" password: "{{ secret "shared_lists_db_password" }}" + {{ end }} # don't remove this, required to run the app production: diff --git a/compose.sharedlists.yml b/compose.sharedlists.yml new file mode 100644 index 0000000..501c815 --- /dev/null +++ b/compose.sharedlists.yml @@ -0,0 +1,18 @@ +--- +version: "3.8" + +services: + app: + secrets: + - shared_lists_db_password + environment: + - ENABLED_SHARED_LISTS + - SHARED_LISTS_DB_NAME + - SHARED_LISTS_DB_TYPE + - SHARED_LISTS_HOST + - SHARED_LISTS_USER + +secrets: + shared_lists_db_password: + name: ${STACK_NAME}_shared_lists_db_password_${SECRET_SHARED_LISTS_DB_PASSWORD_VERSION} + external: true diff --git a/compose.yml b/compose.yml index f45eae9..b357477 100644 --- a/compose.yml +++ b/compose.yml @@ -10,7 +10,6 @@ services: secrets: - db_password - secret_key_base - - shared_lists_db_password - smtp_password configs: - source: app_config @@ -44,10 +43,6 @@ services: - QUEUE=foodsoft_notifier - REDIS_URL=redis://cache:6379 - SECRET_KEY_BASE_FILE=/run/secrets/secret_key_base - - SHARED_LISTS_DB_NAME - - SHARED_LISTS_DB_TYPE - - SHARED_LISTS_HOST - - SHARED_LISTS_USER - SMTP_ADDRESS - SMTP_DOMAIN - SMTP_PASSWORD_FILE=/run/secrets/smtp_password @@ -142,9 +137,6 @@ secrets: db_root_password: name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION} external: true - shared_lists_db_password: - name: ${STACK_NAME}_shared_lists_db_password_${SECRET_SHARED_LISTS_DB_PASSWORD_VERSION} - external: true smtp_password: name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} external: true