diff --git a/defaults/main.yml b/defaults/main.yml index a5e156d..4ff4039 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- -etherpad_version: '1.9.1' +etherpad_version: '1.9.2' etherpad_skin: 'colibris' etherpad_skinVariants: 'super-light-toolbar super-light-editor light-background' etherpad_username: 'etherpad' diff --git a/tasks/main.yml b/tasks/main.yml index b233486..89149aa 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -14,6 +14,7 @@ - name: Install Modules include_tasks: modules.yml + tags: modules - name: Use abiword include_tasks: abiword.yml diff --git a/tasks/modules.yml b/tasks/modules.yml index f499001..7a191f6 100644 --- a/tasks/modules.yml +++ b/tasks/modules.yml @@ -1,16 +1,30 @@ --- +#- name: '[Modules] - Install modules' +# npm: +# name: "{{ item.name }}" +# path: "{{ etherpad_app_dir }}/app" +# state: latest +# with_items: "{{ etherpad_plugins }}" +# become: yes +# become_user: "{{ etherpad_username }}" +# when: item.install|lower == 'true' +# notify: +# restart etherpad +# tags: modules + - name: '[Modules] - Install modules' - npm: - name: "{{ item.name }}" - path: "{{ etherpad_app_dir }}/app" - state: latest + shell: + cmd: "npm install --no-save --legacy-peer-deps {{ item.name }}" + args: + chdir: "{{ etherpad_app_dir }}/app" with_items: "{{ etherpad_plugins }}" become: yes become_user: "{{ etherpad_username }}" when: item.install|lower == 'true' notify: restart etherpad + tags: modules - name: '[Modules] - Uninstall modules' npm: @@ -23,3 +37,4 @@ when: item.install|lower == 'false' notify: restart etherpad + tags: modules \ No newline at end of file diff --git a/templates/var/www/etherpad-lite/settings.json.j2 b/templates/var/www/etherpad-lite/settings.json.j2 index 7847f69..af6c358 100644 --- a/templates/var/www/etherpad-lite/settings.json.j2 +++ b/templates/var/www/etherpad-lite/settings.json.j2 @@ -189,7 +189,7 @@ * * * Database specific settings are dependent on dbType, and go in dbSettings. - * Remember that since Etherpad 1.6.0 you can also store these informations in + * Remember that since Etherpad 1.6.0 you can also store this information in * credentials.json. * * For a complete list of the supported drivers, please refer to: @@ -363,6 +363,22 @@ * Settings controlling the session cookie issued by Etherpad. */ "cookie": { + /* + * How often (in milliseconds) the key used to sign the express_sid cookie + * should be rotated. Long rotation intervals reduce signature verification + * overhead (because there are fewer historical keys to check) and database + * load (fewer historical keys to store, and less frequent queries to + * get/update the keys). Short rotation intervals are slightly more secure. + * + * Multiple Etherpad processes sharing the same database (table) is + * supported as long as the clock sync error is significantly less than this + * value. + * + * Key rotation can be disabled (not recommended) by setting this to 0 or + * null, or by disabling session expiration (see sessionLifetime). + */ + "keyRotationInterval": 86400000, // = 1d * 24h/d * 60m/h * 60s/m * 1000ms/s + /* * Value of the SameSite cookie property. "Lax" is recommended unless * Etherpad will be embedded in an iframe from another site, in which case @@ -392,6 +408,8 @@ * indefinitely without consulting authentication or authorization * hooks, so once a user has accessed a pad, the user can continue to * use the pad until the user leaves for longer than sessionLifetime. + * - More historical keys (sessionLifetime / keyRotationInterval) must be + * checked when verifying signatures. * * Session lifetime can be set to infinity (not recommended) by setting this * to null or 0. Note that if the session does not expire, most browsers @@ -649,5 +667,10 @@ "customLocaleStrings": {}, /* Disable Admin UI tests */ - "enableAdminUITests": {{ etherpad_enableAdminUITests }} + "enableAdminUITests": {{ etherpad_enableAdminUITests }}, + + /* + * Enable/Disable case-insensitive pad names. + */ + "lowerCasePadIds": false }