Merge branch 'staging' of git.disroot.org:Disroot-Ansible/etherpad into staging

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'

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
    *