Merge branch 'main' into EW-793

hpi-schul-cloud · Jun 14, 2024 · f3cb026 · f3cb026
2 parents c1fd447 + 122da51
commit f3cb026
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/ansible/roles/schulcloud-server-core/templates/admin-api-server-configmap.yml.j2 b/ansible/roles/schulcloud-server-core/templates/admin-api-server-configmap.yml.j2
@@ -13,3 +13,4 @@ data:
   FEATURE_PROMETHEUS_METRICS_ENABLED: "true"
   CALENDAR_URI: "{{ CALENDAR_URI }}"
   ROCKET_CHAT_URI: "{{ ROCKET_CHAT_URI }}"
+  ETHERPAD__PAD_URI: "https://{{ DOMAIN }}/etherpad/p"
diff --git a/...ble/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob-configmap.yml.j2 b/...ble/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob-configmap.yml.j2
@@ -11,3 +11,5 @@ data:
   EXIT_ON_ERROR: "true"
   SC_DOMAIN: "{{ DOMAIN }}"
   FEATURE_PROMETHEUS_METRICS_ENABLED: "true"
+  ETHERPAD__PAD_URI: "https://{{ DOMAIN }}/etherpad/p"
+