BC-8531 update etherpad to 2.2.6 (#1056)

hpi-schul-cloud · Dec 11, 2024 · d1b0372 · d1b0372
1 parent 0b5bcc1
commit d1b0372
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/ansible/group_vars/all/x_ingress.yml b/ansible/group_vars/all/x_ingress.yml
@@ -205,10 +205,6 @@ default_ingress:
     path: /etherpad
     serviceName: etherpad-nginx-svc
     servicePort: 80
-  etherpad_socket.io:
-    path: /etherpad/socket.io
-    serviceName: etherpad-nginx-svc
-    servicePort: 80
   version_aggregator:
     path: /version
     serviceName: version-aggregator-svc

diff --git a/ansible/roles/dof_etherpad/defaults/main.yml b/ansible/roles/dof_etherpad/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 PORT_ETHERPAD: 9009
 ETHERPAD_IMAGE_NAME: docker.io/etherpad/etherpad
-ETHERPAD_IMAGE_TAG: 2.0.1
+ETHERPAD_IMAGE_TAG: 2.2.6
 ETHERPAD_NGINX_IMAGE_NAME: docker.io/nginx
 ETHERPAD_NGINX_IMAGE_TAG: 1.27-alpine
diff --git a/ansible/roles/dof_etherpad/templates/configmap.yml.j2 b/ansible/roles/dof_etherpad/templates/configmap.yml.j2
@@ -8,6 +8,7 @@ metadata:
 data:
   # general
   REQUIRE_SESSION: "true"
+  AUTHENTICATION_METHOD: "apikey"
   PAD_OPTIONS_SHOW_CHAT: "true"
   DISABLE_IP_LOGGING: "true"
   DEFAULT_PAD_TEXT: "Schreib etwas!\n\nDieses Etherpad wird synchronisiert, während du tippst, so dass alle Betrachter jederzeit den selben Text sehen. So könnt ihr auf einfache Weise gemeinsam an Dokumenten arbeiten."