From 82102d3ae310e48329d7a407ee0b19b0484d9cd8 Mon Sep 17 00:00:00 2001
From: meaz <meaz@disroot.org>
Date: Thu, 14 Nov 2024 16:29:16 +0100
Subject: [PATCH] update to 2.2.6 + add vars

---
 defaults/main.yml                             |  5 ++++-
 .../var/www/etherpad-lite/settings.json.j2    | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 33d3469..7f8b047 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 
-etherpad_version: '2.2.5'
+etherpad_version: '2.2.6'
 etherpad_skin: 'colibris'
 etherpad_skinVariants: 'super-light-toolbar super-light-editor light-background'
 etherpad_username: 'etherpad'
@@ -20,6 +20,8 @@ etherpad_group_only: 'false'
 etherpad_editonly: 'false'
 etherpad_minify: 'true'
 etherpad_showSettingsInAdminPage: 'true'
+etherpad_cleanup_enabled: 'false'
+etherpad_cleanup_keepRevisions: '5'
 etherpad_suppressErrorsInPadText: 'false'
 etherpad_allowUnknownFileEnds: 'true'
 etherpad_automaticReconnectionTimeout: '0'
@@ -39,6 +41,7 @@ etherpad_sessionLifetime: '864000000' #10d
 etherpad_sessionRefreshInterval: '86400000' #1d
 etherpad_ip_logging: 'false'
 etherpad_maxHttpBufferSize: '10000'
+etherpad_logLayoutType: 'colored'
 etherpad_enableAdminUITests: 'false'
 etherpad_admin_pwd: 'changeme'
 etherpad_ratelimit_duration: '1'
diff --git a/templates/var/www/etherpad-lite/settings.json.j2 b/templates/var/www/etherpad-lite/settings.json.j2
index 647ac99..710d13b 100644
--- a/templates/var/www/etherpad-lite/settings.json.j2
+++ b/templates/var/www/etherpad-lite/settings.json.j2
@@ -162,6 +162,14 @@
    */
   "showSettingsInAdminPage": {{ etherpad_showSettingsInAdminPage }},
 
+  /*
+   * Settings for cleanup of pads
+   */
+  "cleanup": {
+    "enabled": {{ etherpad_cleanup_enabled }},
+    "keepRevisions": {{ etherpad_cleanup_keepRevisions }}
+  },
+
   /*
    * Node native SSL support
    *
@@ -270,6 +278,13 @@
     "pageDown":  true
   },
 
+  /*
+   * Enables the use of a different server. We have a different one that syncs changes from the original server.
+   * It is hosted on GitHub and should not be blocked by many firewalls.
+   *  https://etherpad.org/ep_infos
+   "updateServer": "https://etherpad.org/ep_infos",
+*/
+
   /*
    * Should we suppress errors from being visible in the default Pad Text?
    */
@@ -662,6 +677,13 @@
    */
   "loglevel": "{{ etherpad_loglevel }}",
 
+    /*
+   * The log layout type to use.
+   *
+   * Valid values: basic, colored
+   */
+   "logLayoutType": "{{ etherpad_logLayoutType }}",
+
   /* Override any strings found in locale directories */
   "customLocaleStrings": {},