From 97c9acb824e9ff5568a4b4e449d57df5aa0119d7 Mon Sep 17 00:00:00 2001 From: Charl Smit Date: Mon, 2 Sep 2024 13:52:02 +0200 Subject: [PATCH 1/2] Add email as env variable --- environments/production/public.yml | 1 + environments/staging/public.yml | 1 + .../ansible/roles/commcarehq/templates/localsettings.py.j2 | 1 + 3 files changed, 3 insertions(+) diff --git a/environments/production/public.yml b/environments/production/public.yml index 94482e77fb..17c5bf618f 100644 --- a/environments/production/public.yml +++ b/environments/production/public.yml @@ -23,6 +23,7 @@ eula_change_email: eula-notifications@dimagi.com contact_email: info@dimagi.com soft_assert_email: commcarehq-ops+soft_asserts@dimagi.com new_domain_email: inquiries@dimagi.com +solutions_aes_email: solutions-tech-app-engineers@dimagi.com ALTERNATE_HOSTS: - rec-mobile.sante.gov.bf - onse-iss.commcarehq.org diff --git a/environments/staging/public.yml b/environments/staging/public.yml index ba59cf47a7..74c5ccc2fd 100644 --- a/environments/staging/public.yml +++ b/environments/staging/public.yml @@ -81,6 +81,7 @@ eula_change_email: eula-notifications@dimagi.com contact_email: info@dimagi.com soft_assert_email: commcarehq-ops+soft_asserts@dimagi.com new_domain_email: inquiries@dimagi.com +solutions_aes_email: solutions-tech-app-engineers@dimagi.com show_maintenance_updates_on_deploy: False couch_dbs: diff --git a/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 b/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 index 5bfb90935d..b2407a089e 100644 --- a/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 +++ b/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 @@ -966,6 +966,7 @@ CONTACT_EMAIL = '{{ contact_email }}' FEEDBACK_EMAIL = '{{ feedback_email }}' SOFT_ASSERT_EMAIL = '{{ soft_assert_email }}' DAILY_DEPLOY_EMAIL = '{{ daily_deploy_email }}' +SOLUTIONS_AES_EMAIL = '{{ solutions_aes_email }}' {% if TRANSIFEX_API_TOKEN %} TRANSIFEX_DETAILS = { 'organization': 'dimagi', From fa61287bdad45310e139d5e94ee313bc0ef1ae79 Mon Sep 17 00:00:00 2001 From: Charl Smit Date: Mon, 2 Sep 2024 14:15:47 +0200 Subject: [PATCH 2/2] Make sure email setting is added to other places as well --- environments/backup-production/public.yml | 1 + src/commcare_cloud/ansible/group_vars/all.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/environments/backup-production/public.yml b/environments/backup-production/public.yml index 6f4d29ce96..457e41ce2b 100644 --- a/environments/backup-production/public.yml +++ b/environments/backup-production/public.yml @@ -23,6 +23,7 @@ eula_change_email: eula-notifications@dimagi.com contact_email: info@dimagi.com soft_assert_email: commcarehq-ops+soft_asserts@dimagi.com new_domain_email: inquiries@dimagi.com +solutions_aes_email: solutions-tech-app-engineers@dimagi.com DATADOG_ENABLED: False diff --git a/src/commcare_cloud/ansible/group_vars/all.yml b/src/commcare_cloud/ansible/group_vars/all.yml index aaea8a6321..f3ad58749f 100644 --- a/src/commcare_cloud/ansible/group_vars/all.yml +++ b/src/commcare_cloud/ansible/group_vars/all.yml @@ -128,6 +128,7 @@ daily_deploy_email: null check_s3_backups_email: null return_path_email: null new_domain_email: inquiries@example.com +solutions_aes_email: null show_maintenance_updates_on_deploy: true ALTERNATE_HOSTS: []