Merge branch 'main' into THR-18-dev-feature-h5p-editor

hpi-schul-cloud · Nov 13, 2023 · 678ae95 · 678ae95
2 parents 9dc86cf + 22b4c1f
commit 678ae95
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml
@@ -933,4 +933,8 @@ configuration_all:
     value: "3310"
     server: true
     client: false
-    nuxtclient: false
+    nuxtclient: false
+  ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS:
+    server: true
+    client: false
+    nuxtclient: false
diff --git a/ansible/host_vars/prod-thr/cfg.yml b/ansible/host_vars/prod-thr/cfg.yml
@@ -14,4 +14,6 @@ FEATURE_NEXTCLOUD_TEAM_FILES_ENABLED: "false"
 NEXTCLOUD_REDIRECT_URL: https://nextcloud.schulcloud-thueringen.de/apps/files/?dir=/
 NEXTCLOUD_BASE_URL: https://nextcloud.schulcloud-thueringen.de
 
+ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS: "schul-cloud.org"
+
 FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false"
diff --git a/ansible/host_vars/ref-thr/cfg.yml b/ansible/host_vars/ref-thr/cfg.yml
@@ -9,3 +9,4 @@ ROOT_URL_REDIRECT: https://test.schulportal-thueringen.de/thueringer_schulcloud
 
 NEXTCLOUD_REDIRECT_URL: https://nextcloud.test.schulcloud-thueringen.de/apps/files/?dir=/
 NEXTCLOUD_BASE_URL: https://nextcloud.test.schulcloud-thueringen.de
+ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS: "schul-cloud.org"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ ROOT_URL_REDIRECT: https://test.schulportal-thueringen.de/thueringer_schulcloud

		NEXTCLOUD_REDIRECT_URL: https://nextcloud.test.schulcloud-thueringen.de/apps/files/?dir=/
		NEXTCLOUD_BASE_URL: https://nextcloud.test.schulcloud-thueringen.de
		ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS: "schul-cloud.org"