Merge pull request #1490 from pushytoxin/master

Upgrade Etherpad to 1.8.16
3 years ago · dbe63de712
parent c340edad57 1066baed38
commit dbe63de712
2 changed files with 5 additions and 2 deletions
--- a/roles/matrix-etherpad/defaults/main.yml
+++ b/roles/matrix-etherpad/defaults/main.yml
@ -2,7 +2,7 @@ matrix_etherpad_enabled: false

 matrix_etherpad_base_path: "{{ matrix_base_data_path }}/etherpad"

-matrix_etherpad_version: 1.8.12
+matrix_etherpad_version: 1.8.16
 matrix_etherpad_docker_image: "{{ matrix_container_global_registry_prefix }}etherpad/etherpad:{{ matrix_etherpad_version }}"
 matrix_etherpad_docker_image_force_pull: "{{ matrix_etherpad_docker_image.endswith(':latest') }}"

--- a/roles/matrix-etherpad/templates/settings.json.j2
+++ b/roles/matrix-etherpad/templates/settings.json.j2
@ -46,6 +46,8 @@
    "maxHttpBufferSize": 10000
  },
  "loadTest": false,
+  "dumpOnUncleanExit": false,
+  "indentationOnNewLine": false,
  "importExportRateLimiting": {
    "windowMs": 90000,
    "max": 10
@ -101,5 +103,6 @@
        }
      ]
    },
-  "customLocaleStrings": {}
+  "customLocaleStrings": {},
+  "enableAdminUITests": false
 }