From 505e93d8339be487c2049fe7503cf024fa364464 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 15 Jan 2021 11:27:15 +0100 Subject: [PATCH] plugin app manager docker: use default emails for weblate: when `email_from` was not set in `sat.conf`, no value was set for `WEBLATE_SERVER_EMAIL` and `WEBLATE_DEFAULT_FROM_EMAIL`. These environment variables are needed for Weblate to be launched, so default value are now used (the same as the one from official Weblate Docker image). --- sat/plugins/plugin_app_manager_docker/sat_app_weblate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sat/plugins/plugin_app_manager_docker/sat_app_weblate.yaml b/sat/plugins/plugin_app_manager_docker/sat_app_weblate.yaml index 1560baeb..8edfb9df 100644 --- a/sat/plugins/plugin_app_manager_docker/sat_app_weblate.yaml +++ b/sat/plugins/plugin_app_manager_docker/sat_app_weblate.yaml @@ -13,8 +13,8 @@ override: WEBLATE_EMAIL_HOST: !sat_conf ["", "email_server"] WEBLATE_EMAIL_HOST_USER: !sat_conf ["", "email_username"] WEBLATE_EMAIL_HOST_PASSWORD: !sat_conf ["", "email_password"] - WEBLATE_SERVER_EMAIL: !sat_conf ["", "email_from"] - WEBLATE_DEFAULT_FROM_EMAIL: !sat_conf ["", "email_from"] + WEBLATE_SERVER_EMAIL: !sat_conf ["", "email_from", "weblate@example.com"] + WEBLATE_DEFAULT_FROM_EMAIL: !sat_conf ["", "email_from", "weblate@example.com"] WEBLATE_SITE_DOMAIN: !sat_conf ["", "public_url"] WEBLATE_ADMIN_PASSWORD: !sat_generate_pwd WEBLATE_ADMIN_EMAIL: !sat_conf ["", "email_admins_list", "", "first"]