Merge branch 'staging' into nodejs

defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 
-etherpad_version: '2.0.2'
+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
    *
@@ -665,4 +672,35 @@
    * Enable/Disable case-insensitive pad names.
    */
   "lowerCasePadIds": false
+  
+  /*"sso": {
+    "issuer": "${SSO_ISSUER:http://localhost:9001}",
+      "clients": [
+        {
+          "client_id": "${ADMIN_CLIENT:admin_client}",
+          "client_secret": "${ADMIN_SECRET:admin}",
+          "grant_types": ["authorization_code"],
+          "response_types": ["code"],
+          "redirect_uris": ["${ADMIN_REDIRECT:http://localhost:9001/admin/}"]
+        },
+        {
+          "client_id": "${USER_CLIENT:user_client}",
+          "client_secret": "${USER_SECRET:user}",
+          "grant_types": ["authorization_code"],
+          "response_types": ["code"],
+          "redirect_uris": ["${USER_REDIRECT:http://localhost:9001/}"]
+        }
+      ]
+    }
+   */
+    /* Set the time to live for the tokens
+         This is the time of seconds a user is logged into Etherpad
+    "ttl":  {
+        "AccessToken": 3600,
+        "AuthorizationCode": 600,
+        "ClientCredentials": 3600,
+        "IdToken": 3600,
+        "RefreshToken": 86400
+    }
+    */
 }