From 37e9b0031fe8ca2fe142ef69391906bd0c971bc4 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Fri, 23 May 2025 11:15:49 +0200
Subject: [PATCH] Bug 39206: Modify koha-conf templates

Test plan:
Just read the patch.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 5493e212f6cdafe1533fda61351ff9606a3d13fc)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
---
 debian/templates/koha-conf-site.xml.in | 8 +++-----
 etc/koha-conf.xml                      | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 1f034a26c5..afc23a98cc 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -474,11 +474,9 @@ __END_SRU_PUBLICSERVER__
  </background_jobs_worker>
 
  <do_not_remove_cookie>__KEEP_COOKIE__</do_not_remove_cookie>
- <do_not_remove_cookie>catalogue_editor_\d+</do_not_remove_cookie>
- <!-- Uncomment lines like hereunder to not clear cookies at logout:
-      The cookie name is case sensitive.
-      NOTE: You may use regex constructions like the example above.
-     <do_not_remove_cookie>KohaOpacLanguage</do_not_remove_cookie>
+ <!-- Example lines. See Koha/CookieManager.pm for more details.
+     <do_not_remove_cookie>some_cookie</do_not_remove_cookie>
+     <remove_cookie>another_cookie</remove_cookie>
  -->
 
  <message_domain_limits>
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index b162219f9c..33768161a2 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -285,11 +285,9 @@
      <max_processes>1</max_processes>
  </background_jobs_worker>
 
- <do_not_remove_cookie>catalogue_editor_\d+</do_not_remove_cookie>
- <!-- Uncomment lines like hereunder to not clear cookies at logout:
-      The cookie name is case sensitive.
-      NOTE: You may use regex constructions like the example above.
-     <do_not_remove_cookie>KohaOpacLanguage</do_not_remove_cookie>
+ <!-- Example lines. See Koha/CookieManager.pm for more details.
+     <do_not_remove_cookie>some_cookie</do_not_remove_cookie>
+     <remove_cookie>another_cookie</remove_cookie>
  -->
 
  <message_domain_limits>