From d1b0372bac3ebcf7cf1bfda826acfa611d4fe7fe Mon Sep 17 00:00:00 2001 From: Phillip Date: Wed, 11 Dec 2024 15:36:03 +0100 Subject: [PATCH] BC-8531 update etherpad to 2.2.6 (#1056) --- ansible/group_vars/all/x_ingress.yml | 4 ---- ansible/roles/dof_etherpad/defaults/main.yml | 2 +- ansible/roles/dof_etherpad/templates/configmap.yml.j2 | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ansible/group_vars/all/x_ingress.yml b/ansible/group_vars/all/x_ingress.yml index 9d7d3279b..9c4014c77 100644 --- 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 index 1984c8bee..540375d23 100644 --- 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 \ No newline at end of file diff --git a/ansible/roles/dof_etherpad/templates/configmap.yml.j2 b/ansible/roles/dof_etherpad/templates/configmap.yml.j2 index b277cb950..65e466e15 100644 --- 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."