From 1066baed38516a570315e9af96f4376c5e6ff0b4 Mon Sep 17 00:00:00 2001
From: pushytoxin <github@becker.rocks>
Date: Tue, 28 Dec 2021 13:43:22 +0100
Subject: [PATCH] Upgrade etherpad to 1.8.16

Extend the config template with the lines added in the past year
---
 roles/matrix-etherpad/defaults/main.yml          | 2 +-
 roles/matrix-etherpad/templates/settings.json.j2 | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/roles/matrix-etherpad/defaults/main.yml b/roles/matrix-etherpad/defaults/main.yml
index 45f8f8b2..f04d8589 100644
--- 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') }}"
 
diff --git a/roles/matrix-etherpad/templates/settings.json.j2 b/roles/matrix-etherpad/templates/settings.json.j2
index 377bad98..573b445d 100644
--- 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
 }