Merge branch 'main' into dependabot/npm_and_yarn/jose-5.6.3

hpi-schul-cloud · Jul 19, 2024 · dc20a4c · dc20a4c
2 parents c1194ac + 2b3606d
commit dc20a4c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/...s/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob-configmap.yml.j2 b/...s/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob-configmap.yml.j2
@@ -11,3 +11,4 @@ data:
   EXIT_ON_ERROR: "true"
   SC_DOMAIN: "{{ DOMAIN }}"
   FEATURE_PROMETHEUS_METRICS_ENABLED: "true"
+  ETHERPAD__PAD_URI: "https://{{ DOMAIN }}/etherpad/p"
diff --git a/ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob-configmap.yml.j2 b/ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob-configmap.yml.j2
@@ -11,3 +11,4 @@ data:
   EXIT_ON_ERROR: "true"
   SC_DOMAIN: "{{ DOMAIN }}"
   FEATURE_PROMETHEUS_METRICS_ENABLED: "true"
+  ETHERPAD__PAD_URI: "https://{{ DOMAIN }}/etherpad/p"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -331,7 +331,7 @@
 		"sinon": "^11.1.1",
 		"sinon-chai": "^3.5.0",
 		"socket.io-client": "^4.7.5",
-		"supertest": "^6.3.2",
+		"supertest": "^7.0.0",
 		"ts-jest": "^29.0.5",
 		"ts-loader": "^9.4.2",
 		"ts-node": "^10.9.1",