From 4c1588a1b617d4803893fb5c4498e49503aa6be1 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 7 Nov 2024 17:45:33 +0100 Subject: [PATCH] feat: v4.9.1 I didn't make a release yet. Testing... --- .env.sample | 2 ++ abra.sh | 2 +- app_config.yml.tmpl | 6 ++++++ compose.yml | 10 ++++++---- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.env.sample b/.env.sample index d929b02..66ae798 100644 --- a/.env.sample +++ b/.env.sample @@ -19,10 +19,12 @@ FOODCOOP_HELP_URL=https://order.example.org FOODCOOP_TIME_ZONE=Amsterdam FOODCOOP_USE_NICK=true FOODCOOP_LANGUAGE=en +FOODCOOP_LOGOUT_URL=https://foodcoop.test FOODCOOP_FOOTER='example hosted by Your Tech Co-op.' USE_APPLE_POINTS=false STOP_ORDERING_UNDER=75 MINIMUM_BALANCE=0 +DISABLE_MEMBERS_OVERVIEW=true # database settings MYSQL_DB=foodsoft diff --git a/abra.sh b/abra.sh index cf304e2..983cda5 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_CONFIG_VERSION=v5 +export APP_CONFIG_VERSION=v6 export DB_CONFIG_VERSION=v1 export ENTRYPOINT_VERSION=v1 export PRODUCTION_ENV_VERSION=v1 diff --git a/app_config.yml.tmpl b/app_config.yml.tmpl index f1e1a58..e620362 100644 --- a/app_config.yml.tmpl +++ b/app_config.yml.tmpl @@ -135,6 +135,12 @@ default: &defaults #mailing_list: list@example.org #mailing_list_subscribe: list-subscribe@example.org + # URL to redirect to after logging out + # logout_redirect_url: {{ env "FOODCOOP_LOGOUT_URL" }} + + # When enabled only administrators can access the member list. + # disable_members_overview: {{ env "DISABLE_MEMBERS_OVERVIEW" }} + # Config for the exception_notification plugin notification: error_recipients: diff --git a/compose.yml b/compose.yml index edf0486..b9029df 100644 --- a/compose.yml +++ b/compose.yml @@ -21,6 +21,7 @@ x-env: &env FOODCOOP_ZIP_CODE: FOODCOOP_USE_NICK: FOODCOOP_LANGUAGE: + FOODCOOP_LOGOUT_URL: LOG_LEVEL: MINIMUM_BALANCE: MYSQL_DB: @@ -39,6 +40,7 @@ x-env: &env SMTP_USER_NAME: STOP_ORDERING_UNDER: USE_APPLE_POINTS: + DISABLE_MEMBERS_OVERVIEW: x-configs: &configs - source: app_config @@ -56,7 +58,7 @@ x-secrets: &secrets services: app: - image: foodcoops/foodsoft:4.8.0 + image: foodcoops/foodsoft:4.9.1 networks: - internal - proxy @@ -85,7 +87,7 @@ services: - "coop-cloud.${STACK_NAME}.version=1.2.0+4.8.0" cron: - image: foodcoops/foodsoft:4.8.0 + image: foodcoops/foodsoft:4.9.1 secrets: *secrets configs: *configs entrypoint: *entrypoint @@ -96,7 +98,7 @@ services: - internal worker: - image: foodcoops/foodsoft:4.8.0 + image: foodcoops/foodsoft:4.9.1 secrets: *secrets configs: *configs entrypoint: *entrypoint @@ -107,7 +109,7 @@ services: - internal smtp: - image: foodcoops/foodsoft:4.8.0 + image: foodcoops/foodsoft:4.9.1 configs: *configs entrypoint: *entrypoint secrets: *secrets