From 10fa81947692ddb29d2f16999b8b621088fea78d Mon Sep 17 00:00:00 2001 From: "hoeppner.dataport" Date: Fri, 17 Jan 2025 11:50:02 +0100 Subject: [PATCH 1/8] replace nbc contact and accessibility report email --- ansible/group_vars/nbc/instance_cfg.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/nbc/instance_cfg.yml b/ansible/group_vars/nbc/instance_cfg.yml index afcb7f9ea..166d43b1a 100644 --- a/ansible/group_vars/nbc/instance_cfg.yml +++ b/ansible/group_vars/nbc/instance_cfg.yml @@ -4,7 +4,7 @@ SC_SHORTNAME: nbc SC_TITLE: Niedersächsische Bildungscloud SC_PRODUCTNAME: Niedersächsische Bildungscloud SC_NAV_TITLE: Niedersächsische Bildungscloud -SC_CONTACT_EMAIL: nbc-support@netz-21.de +SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support GLOBAL_ANNOUNCEMENT_TEXT: "" GLOBAL_ANNOUNCEMENT_ROLES: teacher,administrator TRAINING_URL: "https://openelec.moodle-nds.de/course/index.php?categoryid=53" @@ -95,7 +95,7 @@ ES_MERLIN_AUTH_URL: http://merlin.nibis.de/auth.php # produktive Instanz PROD_INSTANCE: true # accessibility -ACCESSIBILITY_REPORT_EMAIL: nbc-support@netz-21.de +ACCESSIBILITY_REPORT_EMAIL: ticketsystem@niedersachsen.support # Identity Management IDENTITY_MANAGEMENT__TENANT: "{{ SC_THEME }}" From 3b36dd2a624f5aadb6e91bb98d4f5006a065e03a Mon Sep 17 00:00:00 2001 From: "hoeppner.dataport" Date: Mon, 20 Jan 2025 11:33:47 +0100 Subject: [PATCH 2/8] add SC_CONTACT_EMAIL according to different configurations --- ansible/group_vars/loadtest/smtp.yml | 3 ++- ansible/host_vars/prod-brb/smtp.yml | 1 + ansible/host_vars/prod-dbc/smtp.yml | 3 ++- ansible/host_vars/prod-nbc/smtp.yml | 3 ++- ansible/host_vars/prod-thr/smtp.yml | 1 + ansible/host_vars/ref-audit/smtp.yml | 3 ++- ansible/host_vars/ref-brb/smtp.yml | 1 + ansible/host_vars/ref-dbc/smtp.yml | 3 ++- ansible/host_vars/ref-nbc/smtp.yml | 1 + ansible/host_vars/ref-thr/smtp.yml | 1 + 10 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ansible/group_vars/loadtest/smtp.yml b/ansible/group_vars/loadtest/smtp.yml index f4dc01873..4fe77c677 100644 --- a/ansible/group_vars/loadtest/smtp.yml +++ b/ansible/group_vars/loadtest/smtp.yml @@ -1,3 +1,4 @@ # SMTP SMTP_SENDER: dont-talk-with-me@dof.loadtest.hpi-schul-cloud.org -SUPPORT_WISH_EMAIL_ADDRESS: support@dbildungscloud.de \ No newline at end of file +SUPPORT_WISH_EMAIL_ADDRESS: support@dbildungscloud.de +SC_CONTACT_EMAIL: support@dbildungscloud.de diff --git a/ansible/host_vars/prod-brb/smtp.yml b/ansible/host_vars/prod-brb/smtp.yml index 8e4cf9fcf..66965bba3 100644 --- a/ansible/host_vars/prod-brb/smtp.yml +++ b/ansible/host_vars/prod-brb/smtp.yml @@ -1,3 +1,4 @@ SUPPORT_WISH_EMAIL_ADDRESS: "schul-cloud@bildungsserver.berlin-brandenburg.de" # SUPPORT_EMAIL SUPPORT_PROBLEM_EMAIL_ADDRESS: "schul-cloud@bildungsserver.berlin-brandenburg.de" +SC_CONTACT_EMAIL: "schul-cloud@bildungsserver.berlin-brandenburg.de" diff --git a/ansible/host_vars/prod-dbc/smtp.yml b/ansible/host_vars/prod-dbc/smtp.yml index a9fa51d77..a7e8ebffc 100644 --- a/ansible/host_vars/prod-dbc/smtp.yml +++ b/ansible/host_vars/prod-dbc/smtp.yml @@ -1,4 +1,5 @@ SUPPORT_WISH_EMAIL_ADDRESS: ticketsystem@dbildungscloud.de # SUPPORT_EMAIL SUPPORT_PROBLEM_EMAIL_ADDRESS: "ticketsystem@dbildungscloud.de" -SMTP_SENDER: noreply@dbildungscloud.de \ No newline at end of file +SC_CONTACT_EMAIL: "ticketsystem@dbildungscloud.de" +SMTP_SENDER: noreply@dbildungscloud.de diff --git a/ansible/host_vars/prod-nbc/smtp.yml b/ansible/host_vars/prod-nbc/smtp.yml index 12242ee7a..a596c24f5 100644 --- a/ansible/host_vars/prod-nbc/smtp.yml +++ b/ansible/host_vars/prod-nbc/smtp.yml @@ -1,2 +1,3 @@ SUPPORT_WISH_EMAIL_ADDRESS: "ticketsystem@niedersachsen.support" -SUPPORT_PROBLEM_EMAIL_ADDRESS: "ticketsystem@niedersachsen.support" \ No newline at end of file +SUPPORT_PROBLEM_EMAIL_ADDRESS: "ticketsystem@niedersachsen.support" +SC_CONTACT_EMAIL: "ticketsystem@niedersachsen.support" diff --git a/ansible/host_vars/prod-thr/smtp.yml b/ansible/host_vars/prod-thr/smtp.yml index 2d9102d06..31daa3e85 100644 --- a/ansible/host_vars/prod-thr/smtp.yml +++ b/ansible/host_vars/prod-thr/smtp.yml @@ -1,2 +1,3 @@ SUPPORT_WISH_EMAIL_ADDRESS: "schulcloud-support@thillm.de" SUPPORT_PROBLEM_EMAIL_ADDRESS: "schulcloud-support@thillm.de" +SC_CONTACT_EMAIL: "schulcloud-support@thillm.de" diff --git a/ansible/host_vars/ref-audit/smtp.yml b/ansible/host_vars/ref-audit/smtp.yml index 3170520ca..72c43c307 100644 --- a/ansible/host_vars/ref-audit/smtp.yml +++ b/ansible/host_vars/ref-audit/smtp.yml @@ -1,5 +1,6 @@ # SUPPORT_EMAIL SUPPORT_WISH_EMAIL_ADDRESS: support@dbildungscloud.de -#SUPPORT_PROBLEM_EMAIL_ADDRESS: +SC_CONTACT_EMAIL: support@dbildungscloud.de +#SUPPORT_PROBLEM_EMAIL_ADDRESS: diff --git a/ansible/host_vars/ref-brb/smtp.yml b/ansible/host_vars/ref-brb/smtp.yml index 8e4cf9fcf..66965bba3 100644 --- a/ansible/host_vars/ref-brb/smtp.yml +++ b/ansible/host_vars/ref-brb/smtp.yml @@ -1,3 +1,4 @@ SUPPORT_WISH_EMAIL_ADDRESS: "schul-cloud@bildungsserver.berlin-brandenburg.de" # SUPPORT_EMAIL SUPPORT_PROBLEM_EMAIL_ADDRESS: "schul-cloud@bildungsserver.berlin-brandenburg.de" +SC_CONTACT_EMAIL: "schul-cloud@bildungsserver.berlin-brandenburg.de" diff --git a/ansible/host_vars/ref-dbc/smtp.yml b/ansible/host_vars/ref-dbc/smtp.yml index 51cf61a4d..9b75dab74 100644 --- a/ansible/host_vars/ref-dbc/smtp.yml +++ b/ansible/host_vars/ref-dbc/smtp.yml @@ -1,5 +1,6 @@ # SUPPORT_EMAIL SUPPORT_WISH_EMAIL_ADDRESS: ticketsystem@schul-cloud.org -#SUPPORT_PROBLEM_EMAIL_ADDRESS: +SC_CONTACT_EMAIL: ticketsystem@schul-cloud.org +#SUPPORT_PROBLEM_EMAIL_ADDRESS: diff --git a/ansible/host_vars/ref-nbc/smtp.yml b/ansible/host_vars/ref-nbc/smtp.yml index dbb73ad99..e581a098f 100644 --- a/ansible/host_vars/ref-nbc/smtp.yml +++ b/ansible/host_vars/ref-nbc/smtp.yml @@ -1 +1,2 @@ SUPPORT_WISH_EMAIL_ADDRESS: ticketsystem@schul-cloud.org +SC_CONTACT_EMAIL: ticketsystem@schul-cloud.org diff --git a/ansible/host_vars/ref-thr/smtp.yml b/ansible/host_vars/ref-thr/smtp.yml index 85b1b1508..673491cba 100644 --- a/ansible/host_vars/ref-thr/smtp.yml +++ b/ansible/host_vars/ref-thr/smtp.yml @@ -1,2 +1,3 @@ SUPPORT_WISH_EMAIL_ADDRESS: schulcloud-support@thillm.de,ticketsystem@schul-cloud.org SUPPORT_PROBLEM_EMAIL_ADDRESS: "schulcloud-support@thillm.de" +SC_CONTACT_EMAIL: schulcloud-support@thillm.de From 2422922c5cd6f98a4193bdfed13c86165168d19f Mon Sep 17 00:00:00 2001 From: "hoeppner.dataport" Date: Mon, 20 Jan 2025 17:07:33 +0100 Subject: [PATCH 3/8] change nbc contact mail for ref --- ansible/host_vars/ref-nbc/smtp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/host_vars/ref-nbc/smtp.yml b/ansible/host_vars/ref-nbc/smtp.yml index e581a098f..b647e5fb1 100644 --- a/ansible/host_vars/ref-nbc/smtp.yml +++ b/ansible/host_vars/ref-nbc/smtp.yml @@ -1,2 +1,2 @@ SUPPORT_WISH_EMAIL_ADDRESS: ticketsystem@schul-cloud.org -SC_CONTACT_EMAIL: ticketsystem@schul-cloud.org +SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support From 9d5ba772e1b26eca4f7256e5730f91b5a56235e8 Mon Sep 17 00:00:00 2001 From: "hoeppner.dataport" Date: Wed, 22 Jan 2025 09:39:16 +0100 Subject: [PATCH 4/8] chore: re-remove redundant sc_contact_mail from smtp.yml files --- ansible/group_vars/dbc/instance_cfg.yml | 1 + ansible/group_vars/loadtest/smtp.yml | 1 - ansible/host_vars/prod-brb/smtp.yml | 1 - ansible/host_vars/prod-dbc/smtp.yml | 1 - ansible/host_vars/prod-nbc/smtp.yml | 1 - ansible/host_vars/prod-thr/smtp.yml | 1 - ansible/host_vars/ref-audit/smtp.yml | 1 - ansible/host_vars/ref-brb/smtp.yml | 1 - ansible/host_vars/ref-dbc/smtp.yml | 2 +- ansible/host_vars/ref-nbc/smtp.yml | 1 - ansible/host_vars/ref-thr/smtp.yml | 1 - 11 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ansible/group_vars/dbc/instance_cfg.yml b/ansible/group_vars/dbc/instance_cfg.yml index 26c1fdfec..c2941c327 100644 --- a/ansible/group_vars/dbc/instance_cfg.yml +++ b/ansible/group_vars/dbc/instance_cfg.yml @@ -4,6 +4,7 @@ SC_SHORTNAME: dbc SC_TITLE: dBildungscloud SC_PRODUCTNAME: dBildungscloud SC_NAV_TITLE: dBildungscloud +SC_CONTACT_EMAIL: "ticketsystem@dbildungscloud.de" GLOBAL_ANNOUNCEMENT_TEXT: '' GLOBAL_ANNOUNCEMENT_ROLES: teacher,administrator diff --git a/ansible/group_vars/loadtest/smtp.yml b/ansible/group_vars/loadtest/smtp.yml index 4fe77c677..55075e554 100644 --- a/ansible/group_vars/loadtest/smtp.yml +++ b/ansible/group_vars/loadtest/smtp.yml @@ -1,4 +1,3 @@ # SMTP SMTP_SENDER: dont-talk-with-me@dof.loadtest.hpi-schul-cloud.org SUPPORT_WISH_EMAIL_ADDRESS: support@dbildungscloud.de -SC_CONTACT_EMAIL: support@dbildungscloud.de diff --git a/ansible/host_vars/prod-brb/smtp.yml b/ansible/host_vars/prod-brb/smtp.yml index 66965bba3..8e4cf9fcf 100644 --- a/ansible/host_vars/prod-brb/smtp.yml +++ b/ansible/host_vars/prod-brb/smtp.yml @@ -1,4 +1,3 @@ SUPPORT_WISH_EMAIL_ADDRESS: "schul-cloud@bildungsserver.berlin-brandenburg.de" # SUPPORT_EMAIL SUPPORT_PROBLEM_EMAIL_ADDRESS: "schul-cloud@bildungsserver.berlin-brandenburg.de" -SC_CONTACT_EMAIL: "schul-cloud@bildungsserver.berlin-brandenburg.de" diff --git a/ansible/host_vars/prod-dbc/smtp.yml b/ansible/host_vars/prod-dbc/smtp.yml index a7e8ebffc..b4b804d46 100644 --- a/ansible/host_vars/prod-dbc/smtp.yml +++ b/ansible/host_vars/prod-dbc/smtp.yml @@ -1,5 +1,4 @@ SUPPORT_WISH_EMAIL_ADDRESS: ticketsystem@dbildungscloud.de # SUPPORT_EMAIL SUPPORT_PROBLEM_EMAIL_ADDRESS: "ticketsystem@dbildungscloud.de" -SC_CONTACT_EMAIL: "ticketsystem@dbildungscloud.de" SMTP_SENDER: noreply@dbildungscloud.de diff --git a/ansible/host_vars/prod-nbc/smtp.yml b/ansible/host_vars/prod-nbc/smtp.yml index a596c24f5..6987ace57 100644 --- a/ansible/host_vars/prod-nbc/smtp.yml +++ b/ansible/host_vars/prod-nbc/smtp.yml @@ -1,3 +1,2 @@ SUPPORT_WISH_EMAIL_ADDRESS: "ticketsystem@niedersachsen.support" SUPPORT_PROBLEM_EMAIL_ADDRESS: "ticketsystem@niedersachsen.support" -SC_CONTACT_EMAIL: "ticketsystem@niedersachsen.support" diff --git a/ansible/host_vars/prod-thr/smtp.yml b/ansible/host_vars/prod-thr/smtp.yml index 31daa3e85..2d9102d06 100644 --- a/ansible/host_vars/prod-thr/smtp.yml +++ b/ansible/host_vars/prod-thr/smtp.yml @@ -1,3 +1,2 @@ SUPPORT_WISH_EMAIL_ADDRESS: "schulcloud-support@thillm.de" SUPPORT_PROBLEM_EMAIL_ADDRESS: "schulcloud-support@thillm.de" -SC_CONTACT_EMAIL: "schulcloud-support@thillm.de" diff --git a/ansible/host_vars/ref-audit/smtp.yml b/ansible/host_vars/ref-audit/smtp.yml index 72c43c307..da7561bf5 100644 --- a/ansible/host_vars/ref-audit/smtp.yml +++ b/ansible/host_vars/ref-audit/smtp.yml @@ -1,6 +1,5 @@ # SUPPORT_EMAIL SUPPORT_WISH_EMAIL_ADDRESS: support@dbildungscloud.de -SC_CONTACT_EMAIL: support@dbildungscloud.de #SUPPORT_PROBLEM_EMAIL_ADDRESS: diff --git a/ansible/host_vars/ref-brb/smtp.yml b/ansible/host_vars/ref-brb/smtp.yml index 66965bba3..8e4cf9fcf 100644 --- a/ansible/host_vars/ref-brb/smtp.yml +++ b/ansible/host_vars/ref-brb/smtp.yml @@ -1,4 +1,3 @@ SUPPORT_WISH_EMAIL_ADDRESS: "schul-cloud@bildungsserver.berlin-brandenburg.de" # SUPPORT_EMAIL SUPPORT_PROBLEM_EMAIL_ADDRESS: "schul-cloud@bildungsserver.berlin-brandenburg.de" -SC_CONTACT_EMAIL: "schul-cloud@bildungsserver.berlin-brandenburg.de" diff --git a/ansible/host_vars/ref-dbc/smtp.yml b/ansible/host_vars/ref-dbc/smtp.yml index 9b75dab74..f05531e83 100644 --- a/ansible/host_vars/ref-dbc/smtp.yml +++ b/ansible/host_vars/ref-dbc/smtp.yml @@ -1,6 +1,6 @@ # SUPPORT_EMAIL SUPPORT_WISH_EMAIL_ADDRESS: ticketsystem@schul-cloud.org -SC_CONTACT_EMAIL: ticketsystem@schul-cloud.org + #SUPPORT_PROBLEM_EMAIL_ADDRESS: diff --git a/ansible/host_vars/ref-nbc/smtp.yml b/ansible/host_vars/ref-nbc/smtp.yml index b647e5fb1..dbb73ad99 100644 --- a/ansible/host_vars/ref-nbc/smtp.yml +++ b/ansible/host_vars/ref-nbc/smtp.yml @@ -1,2 +1 @@ SUPPORT_WISH_EMAIL_ADDRESS: ticketsystem@schul-cloud.org -SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support diff --git a/ansible/host_vars/ref-thr/smtp.yml b/ansible/host_vars/ref-thr/smtp.yml index 673491cba..85b1b1508 100644 --- a/ansible/host_vars/ref-thr/smtp.yml +++ b/ansible/host_vars/ref-thr/smtp.yml @@ -1,3 +1,2 @@ SUPPORT_WISH_EMAIL_ADDRESS: schulcloud-support@thillm.de,ticketsystem@schul-cloud.org SUPPORT_PROBLEM_EMAIL_ADDRESS: "schulcloud-support@thillm.de" -SC_CONTACT_EMAIL: schulcloud-support@thillm.de From 02cb4c4c65cb3cc51848f6fb209061838fa1dfc3 Mon Sep 17 00:00:00 2001 From: "hoeppner.dataport" Date: Wed, 22 Jan 2025 13:03:10 +0100 Subject: [PATCH 5/8] introduce SC_CONTACT_EMAIL to individual configurations --- ansible/group_vars/dbc/instance_cfg.yml | 2 +- ansible/host_vars/prod-brb/cfg.yml | 1 + ansible/host_vars/prod-dbc/cfg.yml | 1 + ansible/host_vars/prod-nbc/cfg.yml | 1 + ansible/host_vars/prod-thr/cfg.yml | 1 + ansible/host_vars/ref-brb/cfg.yml | 1 + ansible/host_vars/ref-dbc/cfg.yml | 1 + ansible/host_vars/ref-nbc/cfg.yml | 1 + ansible/host_vars/ref-thr/cfg.yml | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/dbc/instance_cfg.yml b/ansible/group_vars/dbc/instance_cfg.yml index c2941c327..d5805f1cd 100644 --- a/ansible/group_vars/dbc/instance_cfg.yml +++ b/ansible/group_vars/dbc/instance_cfg.yml @@ -4,7 +4,7 @@ SC_SHORTNAME: dbc SC_TITLE: dBildungscloud SC_PRODUCTNAME: dBildungscloud SC_NAV_TITLE: dBildungscloud -SC_CONTACT_EMAIL: "ticketsystem@dbildungscloud.de" +SC_CONTACT_EMAIL: ticketsystem@dbildungscloud.de GLOBAL_ANNOUNCEMENT_TEXT: '' GLOBAL_ANNOUNCEMENT_ROLES: teacher,administrator diff --git a/ansible/host_vars/prod-brb/cfg.yml b/ansible/host_vars/prod-brb/cfg.yml index 97da3be1a..6ce7820d4 100644 --- a/ansible/host_vars/prod-brb/cfg.yml +++ b/ansible/host_vars/prod-brb/cfg.yml @@ -1,5 +1,6 @@ NAMESPACE: brandenburg DOMAIN: brandenburg.cloud +SC_CONTACT_EMAIL: schul-cloud@bildungsserver.berlin-brandenburg.de ALERT_STATUS_URL: https://status.brandenburg.cloud diff --git a/ansible/host_vars/prod-dbc/cfg.yml b/ansible/host_vars/prod-dbc/cfg.yml index 147569f40..52d6dae53 100644 --- a/ansible/host_vars/prod-dbc/cfg.yml +++ b/ansible/host_vars/prod-dbc/cfg.yml @@ -1,5 +1,6 @@ NAMESPACE: hpibosscloud DOMAIN: dbildungscloud.de +SC_CONTACT_EMAIL: ticketsystem@dbildungscloud.de ROCKETCHAT_DNS_PREFIX: scchat. ALERT_STATUS_URL: "https://status.dbildungscloud.de" diff --git a/ansible/host_vars/prod-nbc/cfg.yml b/ansible/host_vars/prod-nbc/cfg.yml index 1d118b95d..3291e8764 100644 --- a/ansible/host_vars/prod-nbc/cfg.yml +++ b/ansible/host_vars/prod-nbc/cfg.yml @@ -1,5 +1,6 @@ NAMESPACE: niedersachsen DOMAIN: niedersachsen.cloud +SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support ALERT_STATUS_URL: https://status.niedersachsen.cloud/ diff --git a/ansible/host_vars/prod-thr/cfg.yml b/ansible/host_vars/prod-thr/cfg.yml index 11d0ee1cf..1be3b8010 100644 --- a/ansible/host_vars/prod-thr/cfg.yml +++ b/ansible/host_vars/prod-thr/cfg.yml @@ -1,5 +1,6 @@ NAMESPACE: thueringen DOMAIN: schulcloud-thueringen.de +SC_CONTACT_EMAIL: schulcloud-support@thillm.de AWS_ENDPOINT_URL: https://s3.hidrive.strato.com ALERT_STATUS_URL: https://status.schulcloud-thueringen.de/ diff --git a/ansible/host_vars/ref-brb/cfg.yml b/ansible/host_vars/ref-brb/cfg.yml index 7562e25de..57775738a 100644 --- a/ansible/host_vars/ref-brb/cfg.yml +++ b/ansible/host_vars/ref-brb/cfg.yml @@ -1,5 +1,6 @@ NAMESPACE: brandenburg DOMAIN: staging.brandenburg.dbildungscloud.org +SC_CONTACT_EMAIL: schul-cloud@bildungsserver.berlin-brandenburg.de FEATURE_SKIP_FIRST_LOGIN_ENABLED: "true" diff --git a/ansible/host_vars/ref-dbc/cfg.yml b/ansible/host_vars/ref-dbc/cfg.yml index 4387dfbdd..d20470005 100644 --- a/ansible/host_vars/ref-dbc/cfg.yml +++ b/ansible/host_vars/ref-dbc/cfg.yml @@ -1,5 +1,6 @@ NAMESPACE: hpibosscloud DOMAIN: staging.dbildungscloud.org +SC_CONTACT_EMAIL: ticketsystem@dbildungscloud.de DISPLAY_REQUEST_LEVEL: -1 ALERT_STATUS_URL: https://status.dbildungscloud.de/ diff --git a/ansible/host_vars/ref-nbc/cfg.yml b/ansible/host_vars/ref-nbc/cfg.yml index 713d89d5b..609c48c3a 100644 --- a/ansible/host_vars/ref-nbc/cfg.yml +++ b/ansible/host_vars/ref-nbc/cfg.yml @@ -1,5 +1,6 @@ NAMESPACE: niedersachsen DOMAIN: staging.niedersachsen.dbildungscloud.org +SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support ALERT_STATUS_URL: https://status.niedersachsen.cloud/ diff --git a/ansible/host_vars/ref-thr/cfg.yml b/ansible/host_vars/ref-thr/cfg.yml index 592cb90da..60e40ad69 100644 --- a/ansible/host_vars/ref-thr/cfg.yml +++ b/ansible/host_vars/ref-thr/cfg.yml @@ -1,5 +1,6 @@ NAMESPACE: thueringen DOMAIN: test.schulcloud-thueringen.de +SC_CONTACT_EMAIL: schulcloud-support@thillm.de ALERT_STATUS_URL: https://status.schulcloud-thueringen.de/ NOT_AUTHENTICATED_REDIRECT_URL: "https://test.schulportal-thueringen.de/" From 3880a6867bf7f5868d182e34a39a928074253870 Mon Sep 17 00:00:00 2001 From: "hoeppner.dataport" Date: Wed, 22 Jan 2025 13:35:38 +0100 Subject: [PATCH 6/8] set mail for nbc_host --- ansible/host_vars/nbc_host/cfg.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/host_vars/nbc_host/cfg.yml b/ansible/host_vars/nbc_host/cfg.yml index 3955e3496..863163ef2 100644 --- a/ansible/host_vars/nbc_host/cfg.yml +++ b/ansible/host_vars/nbc_host/cfg.yml @@ -1,3 +1,4 @@ +SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support NEXTCLOUD_REDIRECT_URL: https://nextcloud-nbc.dbildungscloud.dev/apps/files/?dir=/ NEXTCLOUD_BASE_URL: https://nextcloud-nbc.dbildungscloud.dev/ BETTERMARKS_APPS_URL: "https://apps.bettermarks.nbc.dbildungscloud.dev" From 1800e4ac27e66c7c44b8afe79d7e69e5f0f80b43 Mon Sep 17 00:00:00 2001 From: "hoeppner.dataport" Date: Wed, 22 Jan 2025 16:30:01 +0100 Subject: [PATCH 7/8] fix config --- ansible/group_vars/all/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index 7a8984d31..bd83a203b 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -62,7 +62,7 @@ configuration_all: nuxtclient: false SC_CONTACT_EMAIL: value: "support@dbildungscloud.de" - server: false + server: true client: true nuxtclient: false ACCESSIBILITY_REPORT_EMAIL: From e1c3889263b2ef6f4ffe2a86cc19d73ebba35a4c Mon Sep 17 00:00:00 2001 From: "hoeppner.dataport" Date: Wed, 22 Jan 2025 16:38:25 +0100 Subject: [PATCH 8/8] chore: remove unneded mail configurations --- ansible/host_vars/nbc_host/cfg.yml | 1 - ansible/host_vars/prod-brb/cfg.yml | 1 - ansible/host_vars/prod-dbc/cfg.yml | 1 - ansible/host_vars/prod-nbc/cfg.yml | 1 - ansible/host_vars/prod-thr/cfg.yml | 1 - ansible/host_vars/ref-brb/cfg.yml | 1 - ansible/host_vars/ref-dbc/cfg.yml | 1 - ansible/host_vars/ref-nbc/cfg.yml | 1 - ansible/host_vars/ref-thr/cfg.yml | 3 +-- 9 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ansible/host_vars/nbc_host/cfg.yml b/ansible/host_vars/nbc_host/cfg.yml index 863163ef2..3955e3496 100644 --- a/ansible/host_vars/nbc_host/cfg.yml +++ b/ansible/host_vars/nbc_host/cfg.yml @@ -1,4 +1,3 @@ -SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support NEXTCLOUD_REDIRECT_URL: https://nextcloud-nbc.dbildungscloud.dev/apps/files/?dir=/ NEXTCLOUD_BASE_URL: https://nextcloud-nbc.dbildungscloud.dev/ BETTERMARKS_APPS_URL: "https://apps.bettermarks.nbc.dbildungscloud.dev" diff --git a/ansible/host_vars/prod-brb/cfg.yml b/ansible/host_vars/prod-brb/cfg.yml index 6ce7820d4..97da3be1a 100644 --- a/ansible/host_vars/prod-brb/cfg.yml +++ b/ansible/host_vars/prod-brb/cfg.yml @@ -1,6 +1,5 @@ NAMESPACE: brandenburg DOMAIN: brandenburg.cloud -SC_CONTACT_EMAIL: schul-cloud@bildungsserver.berlin-brandenburg.de ALERT_STATUS_URL: https://status.brandenburg.cloud diff --git a/ansible/host_vars/prod-dbc/cfg.yml b/ansible/host_vars/prod-dbc/cfg.yml index 52d6dae53..147569f40 100644 --- a/ansible/host_vars/prod-dbc/cfg.yml +++ b/ansible/host_vars/prod-dbc/cfg.yml @@ -1,6 +1,5 @@ NAMESPACE: hpibosscloud DOMAIN: dbildungscloud.de -SC_CONTACT_EMAIL: ticketsystem@dbildungscloud.de ROCKETCHAT_DNS_PREFIX: scchat. ALERT_STATUS_URL: "https://status.dbildungscloud.de" diff --git a/ansible/host_vars/prod-nbc/cfg.yml b/ansible/host_vars/prod-nbc/cfg.yml index 3291e8764..1d118b95d 100644 --- a/ansible/host_vars/prod-nbc/cfg.yml +++ b/ansible/host_vars/prod-nbc/cfg.yml @@ -1,6 +1,5 @@ NAMESPACE: niedersachsen DOMAIN: niedersachsen.cloud -SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support ALERT_STATUS_URL: https://status.niedersachsen.cloud/ diff --git a/ansible/host_vars/prod-thr/cfg.yml b/ansible/host_vars/prod-thr/cfg.yml index 1be3b8010..11d0ee1cf 100644 --- a/ansible/host_vars/prod-thr/cfg.yml +++ b/ansible/host_vars/prod-thr/cfg.yml @@ -1,6 +1,5 @@ NAMESPACE: thueringen DOMAIN: schulcloud-thueringen.de -SC_CONTACT_EMAIL: schulcloud-support@thillm.de AWS_ENDPOINT_URL: https://s3.hidrive.strato.com ALERT_STATUS_URL: https://status.schulcloud-thueringen.de/ diff --git a/ansible/host_vars/ref-brb/cfg.yml b/ansible/host_vars/ref-brb/cfg.yml index 57775738a..7562e25de 100644 --- a/ansible/host_vars/ref-brb/cfg.yml +++ b/ansible/host_vars/ref-brb/cfg.yml @@ -1,6 +1,5 @@ NAMESPACE: brandenburg DOMAIN: staging.brandenburg.dbildungscloud.org -SC_CONTACT_EMAIL: schul-cloud@bildungsserver.berlin-brandenburg.de FEATURE_SKIP_FIRST_LOGIN_ENABLED: "true" diff --git a/ansible/host_vars/ref-dbc/cfg.yml b/ansible/host_vars/ref-dbc/cfg.yml index d20470005..4387dfbdd 100644 --- a/ansible/host_vars/ref-dbc/cfg.yml +++ b/ansible/host_vars/ref-dbc/cfg.yml @@ -1,6 +1,5 @@ NAMESPACE: hpibosscloud DOMAIN: staging.dbildungscloud.org -SC_CONTACT_EMAIL: ticketsystem@dbildungscloud.de DISPLAY_REQUEST_LEVEL: -1 ALERT_STATUS_URL: https://status.dbildungscloud.de/ diff --git a/ansible/host_vars/ref-nbc/cfg.yml b/ansible/host_vars/ref-nbc/cfg.yml index 609c48c3a..713d89d5b 100644 --- a/ansible/host_vars/ref-nbc/cfg.yml +++ b/ansible/host_vars/ref-nbc/cfg.yml @@ -1,6 +1,5 @@ NAMESPACE: niedersachsen DOMAIN: staging.niedersachsen.dbildungscloud.org -SC_CONTACT_EMAIL: ticketsystem@niedersachsen.support ALERT_STATUS_URL: https://status.niedersachsen.cloud/ diff --git a/ansible/host_vars/ref-thr/cfg.yml b/ansible/host_vars/ref-thr/cfg.yml index 60e40ad69..e9bc52f30 100644 --- a/ansible/host_vars/ref-thr/cfg.yml +++ b/ansible/host_vars/ref-thr/cfg.yml @@ -1,6 +1,5 @@ NAMESPACE: thueringen DOMAIN: test.schulcloud-thueringen.de -SC_CONTACT_EMAIL: schulcloud-support@thillm.de ALERT_STATUS_URL: https://status.schulcloud-thueringen.de/ NOT_AUTHENTICATED_REDIRECT_URL: "https://test.schulportal-thueringen.de/" @@ -18,4 +17,4 @@ JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAsMKXe1sn5Ifc0wxEdsm FEATURE_TSP_SYNC_ENABLED: "true" FEATURE_TSP_MIGRATION_ENABLED: "true" -TSP_API_CLIENT_BASE_URL: https://test.schulportal-thueringen.de/tip-ms/api \ No newline at end of file +TSP_API_CLIENT_BASE_URL: https://test.schulportal-thueringen.de/tip-ms/api