From 4079807c8e8546cb0d8c9ee6b4af92936ca4e51c Mon Sep 17 00:00:00 2001 From: muppeth Date: Tue, 4 Jun 2024 21:45:03 +0200 Subject: [PATCH] 2.1.0 - Version bump (#27) Reviewed-on: https://git.disroot.org/Disroot-Ansible/etherpad/pulls/27 Reviewed-by: meaz Co-authored-by: muppeth Co-committed-by: muppeth --- defaults/main.yml | 3 ++- templates/var/www/etherpad-lite/settings.json.j2 | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 76f9562..467bd11 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- -etherpad_version: '2.0.3' +etherpad_version: '2.1.0' etherpad_skin: 'colibris' etherpad_skinVariants: 'super-light-toolbar super-light-editor light-background' etherpad_username: 'etherpad' @@ -27,6 +27,7 @@ etherpad_indentationOnNewLine: 'false' etherpad_importExportRateLimitingwindowMs: '90000' etherpad_importExportRateLimitingMax: '10' etherpad_importMaxFileSize: '52428800' # 50 MB -> 50 * 1024 * 1024 +etherpad_authmethod: 'sso' etherpad_exposeVersion: 'false' etherpad_js_maxage: '21600' etherpad_max_log_size: '1024' diff --git a/templates/var/www/etherpad-lite/settings.json.j2 b/templates/var/www/etherpad-lite/settings.json.j2 index c728cff..647ac99 100644 --- a/templates/var/www/etherpad-lite/settings.json.j2 +++ b/templates/var/www/etherpad-lite/settings.json.j2 @@ -600,6 +600,13 @@ */ "importMaxFileSize": {{ etherpad_importMaxFileSize }}, // 50 * 1024 * 1024 + /* + The authentication method used by the server. + The default value is sso + If you want to use the old authentication system, change this to apikey + */ + "authenticationMethod": "${AUTHENTICATION_METHOD:{{ etherpad_authmethod }}}", + /* * From Etherpad 1.8.5 onwards, when Etherpad is in production mode commits from individual users are rate limited *