From 8970e2354e3ee9e0e0fa57cd9e1ea72cbc4bfa18 Mon Sep 17 00:00:00 2001
From: mhoellein <mhoellein@freenet.de>
Date: Fri, 21 Jan 2022 07:11:19 +0100
Subject: [PATCH] committing changes in /etc after apt run

Package changes:
-code-brand 21.11-13 all
-collaboraoffice 21.06.12-1 amd64
-collaboraoffice-ure 21.06.12-1 amd64
+code-brand 21.11-14 all
+collaboraoffice 21.06.13-1 amd64
+collaboraoffice-ure 21.06.13-1 amd64
-collaboraofficebasis-calc 21.06.12-1 amd64
-collaboraofficebasis-core 21.06.12-1 amd64
-collaboraofficebasis-draw 21.06.12-1 amd64
-collaboraofficebasis-en-us 21.06.12-1 amd64
-collaboraofficebasis-extension-pdf-import 21.06.12-1 amd64
-collaboraofficebasis-graphicfilter 21.06.12-1 amd64
-collaboraofficebasis-images 21.06.12-1 amd64
-collaboraofficebasis-impress 21.06.12-1 amd64
-collaboraofficebasis-math 21.06.12-1 amd64
-collaboraofficebasis-ooofonts 21.06.12-1 amd64
-collaboraofficebasis-ooolinguistic 21.06.12-1 amd64
-collaboraofficebasis-writer 21.06.12-1 amd64
+collaboraofficebasis-calc 21.06.13-1 amd64
+collaboraofficebasis-core 21.06.13-1 amd64
+collaboraofficebasis-draw 21.06.13-1 amd64
+collaboraofficebasis-en-us 21.06.13-1 amd64
+collaboraofficebasis-extension-pdf-import 21.06.13-1 amd64
+collaboraofficebasis-graphicfilter 21.06.13-1 amd64
+collaboraofficebasis-images 21.06.13-1 amd64
+collaboraofficebasis-impress 21.06.13-1 amd64
+collaboraofficebasis-math 21.06.13-1 amd64
+collaboraofficebasis-ooofonts 21.06.13-1 amd64
+collaboraofficebasis-ooolinguistic 21.06.13-1 amd64
+collaboraofficebasis-writer 21.06.13-1 amd64
-coolwsd 21.11.1.1-1 amd64
+coolwsd 21.11.1.3-1 amd64
-thunderbird 1:78.14.0+build1-0ubuntu0.18.04.2 amd64
-thunderbird-gnome-support 1:78.14.0+build1-0ubuntu0.18.04.2 amd64
-thunderbird-locale-en 1:78.14.0+build1-0ubuntu0.18.04.2 amd64
-thunderbird-locale-en-us 1:78.14.0+build1-0ubuntu0.18.04.2 all
+thunderbird 1:91.5.0+build1-0ubuntu0.18.04.1 amd64
+thunderbird-gnome-support 1:91.5.0+build1-0ubuntu0.18.04.1 amd64
+thunderbird-locale-en 1:91.5.0+build1-0ubuntu0.18.04.1 amd64
+thunderbird-locale-en-us 1:91.5.0+build1-0ubuntu0.18.04.1 all
-vim 2:8.0.1453-1ubuntu1.7 amd64
-vim-common 2:8.0.1453-1ubuntu1.7 all
+vim 2:8.0.1453-1ubuntu1.8 amd64
+vim-common 2:8.0.1453-1ubuntu1.8 all
-vim-runtime 2:8.0.1453-1ubuntu1.7 all
-vim-tiny 2:8.0.1453-1ubuntu1.7 amd64
+vim-runtime 2:8.0.1453-1ubuntu1.8 all
+vim-tiny 2:8.0.1453-1ubuntu1.8 amd64
-xxd 2:8.0.1453-1ubuntu1.7 amd64
+xxd 2:8.0.1453-1ubuntu1.8 amd64
---
 .etckeeper                                    |   6 +-
 coolwsd/coolwsd.xml                           | 417 ++++++++----------
 loolwsd/{loolwsd.xml => loolwsd.xml.migrated} |   0
 3 files changed, 198 insertions(+), 225 deletions(-)
 rename loolwsd/{loolwsd.xml => loolwsd.xml.migrated} (100%)

diff --git a/.etckeeper b/.etckeeper
index 57316da1..7aeff5b7 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -10740,9 +10740,9 @@ maybe chmod 0644 'logrotate.d/upstart'
 maybe chmod 0644 'logrotate.d/zoneminder'
 maybe chmod 0755 'loolwsd'
 maybe chmod 0644 'loolwsd/loolkitconfig.xcu'
-maybe chown 'lool' 'loolwsd/loolwsd.xml'
-maybe chgrp 'lool' 'loolwsd/loolwsd.xml'
-maybe chmod 0640 'loolwsd/loolwsd.xml'
+maybe chown 'lool' 'loolwsd/loolwsd.xml.migrated'
+maybe chgrp 'lool' 'loolwsd/loolwsd.xml.migrated'
+maybe chmod 0640 'loolwsd/loolwsd.xml.migrated'
 maybe chown 'lool' 'loolwsd/proof_key'
 maybe chgrp 'lool' 'loolwsd/proof_key'
 maybe chmod 0600 'loolwsd/proof_key'
diff --git a/coolwsd/coolwsd.xml b/coolwsd/coolwsd.xml
index a69286d0..afc052a0 100644
--- a/coolwsd/coolwsd.xml
+++ b/coolwsd/coolwsd.xml
@@ -1,237 +1,210 @@
 <!-- -*- nxml-child-indent: 4; tab-width: 4; indent-tabs-mode: nil -*- -->
 <config>
-
-    <!-- For more detailed documentation on typical configuration options please see:
+	<!-- For more detailed documentation on typical configuration options please see:
          https://sdk.collaboraonline.com/docs/installation/Configuration.html -->
-
-    <!-- Note: 'default' attributes are used to document a setting's default value as well as to use as fallback. -->
-    <!-- Note: When adding a new entry, a default must be set in WSD in case the entry is missing upon deployment. -->
-
-    <allowed_languages desc="List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) on this instance. Allowing too many has negative effect on startup performance." default="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
-
-    <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
-    <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
-    <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
-    <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default=""></server_name>
-    <file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing cool." type="path" relative="true" default="browser/../"></file_server_root_path>
-    <hexify_embedded_urls desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool" default="false"></hexify_embedded_urls>
-
-    <memproportion desc="The maximum percentage of system memory consumed by all of the Collabora Online Development Edition, after which we start cleaning up idle documents" type="double" default="80.0"></memproportion>
-    <num_prespawn_children desc="Number of child processes to keep started in advance and waiting for new clients." type="uint" default="1">1</num_prespawn_children>
-    <per_document desc="Document-specific settings, including LO Core settings.">
-        <max_concurrency desc="The maximum number of threads to use while processing a document." type="uint" default="4">4</max_concurrency>
-        <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
-        <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></document_signing_url>
-        <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
-        <pdf_resolution_dpi desc="The resolution, in DPI, used to render PDF documents as image. Memory consumption grows proportionally. Must be a positive value less than 385. Defaults to 96." type="uint" default="96">96</pdf_resolution_dpi>
-        <idle_timeout_secs desc="The maximum number of seconds before unloading an idle document. Defaults to 1 hour." type="uint" default="3600">3600</idle_timeout_secs>
-        <!-- Idle save and auto save are checked every 30 seconds -->
-        <!-- They are disabled when the value is zero or negative. -->
-        <idlesave_duration_secs desc="The number of idle seconds after which document, if modified, should be saved. Defaults to 30 seconds." type="int" default="30">30</idlesave_duration_secs>
-        <autosave_duration_secs desc="The number of seconds after which document, if modified, should be saved. Defaults to 5 minutes." type="int" default="300">300</autosave_duration_secs>
-        <always_save_on_exit desc="On exiting the last editor, always perform the save, even if the document is not modified." type="bool" default="false">false</always_save_on_exit>
-        <limit_virt_mem_mb desc="The maximum virtual memory allowed to each document process. 0 for unlimited." type="uint">0</limit_virt_mem_mb>
-        <limit_stack_mem_kb desc="The maximum stack size allowed to each document process. 0 for unlimited." type="uint">8000</limit_stack_mem_kb>
-        <limit_file_size_mb desc="The maximum file size allowed to each document process to write. 0 for unlimited." type="uint">0</limit_file_size_mb>
-        <limit_num_open_files desc="The maximum number of files allowed to each document process to open. 0 for unlimited." type="uint">0</limit_num_open_files>
-        <limit_load_secs desc="Maximum number of seconds to wait for a document load to succeed. 0 for unlimited." type="uint" default="100">100</limit_load_secs>
-        <limit_convert_secs desc="Maximum number of seconds to wait for a document conversion to succeed. 0 for unlimited." type="uint" default="100">100</limit_convert_secs>
-        <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="true">
-            <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
-            <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
-            <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
-            <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
-            <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
-            <lost_kit_grace_period_secs desc="The minimum grace period for a lost kit process (not referenced by coolwsd) to resolve its lost status before it is terminated. To disable the cleanup of lost kits use value 0" default="120">120</lost_kit_grace_period_secs>
-        </cleanup>
-    </per_document>
-
-    <per_view desc="View-specific settings.">
-        <out_of_focus_timeout_secs desc="The maximum number of seconds before dimming and stopping updates when the browser tab is no longer in focus. Defaults to 120 seconds." type="uint" default="120">120</out_of_focus_timeout_secs>
-        <idle_timeout_secs desc="The maximum number of seconds before dimming and stopping updates when the user is no longer active (even if the browser is in focus). Defaults to 15 minutes." type="uint" default="900">900</idle_timeout_secs>
-    </per_view>
-
-    <ver_suffix desc="Appended to etags to allow easy refresh of changed files during development" type="string" default=""></ver_suffix>
-
-    <logging>
-        <color type="bool">true</color>
-        <!--
+	<!-- Note: 'default' attributes are used to document a setting's default value as well as to use as fallback. -->
+	<!-- Note: When adding a new entry, a default must be set in WSD in case the entry is missing upon deployment. -->
+	<allowed_languages default="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru" desc="List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) on this instance. Allowing too many has negative effect on startup performance.">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
+	<sys_template_path default="systemplate" desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." relative="true" type="path"/>
+	<child_root_path default="jails" desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." relative="true" type="path"/>
+	<mount_jail_tree default="true" desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool"/>
+	<server_name default="" desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string"/>
+	<file_server_root_path default="browser/../" desc="Path to the directory that should be considered root for the file server. This should be the directory containing cool." relative="true" type="path"/>
+	<hexify_embedded_urls default="false" desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool"/>
+	<memproportion default="80.0" desc="The maximum percentage of system memory consumed by all of the Collabora Online Development Edition, after which we start cleaning up idle documents" type="double"/>
+	<num_prespawn_children default="1" desc="Number of child processes to keep started in advance and waiting for new clients." type="uint">1</num_prespawn_children>
+	<per_document desc="Document-specific settings, including LO Core settings.">
+		<max_concurrency default="4" desc="The maximum number of threads to use while processing a document." type="uint">4</max_concurrency>
+		<batch_priority default="5" desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint">5</batch_priority>
+		<document_signing_url default="" desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string"/>
+		<redlining_as_comments default="false" desc="If true show red-lines as comments" type="bool">false</redlining_as_comments>
+		<pdf_resolution_dpi default="96" desc="The resolution, in DPI, used to render PDF documents as image. Memory consumption grows proportionally. Must be a positive value less than 385. Defaults to 96." type="uint">96</pdf_resolution_dpi>
+		<idle_timeout_secs default="3600" desc="The maximum number of seconds before unloading an idle document. Defaults to 1 hour." type="uint">3600</idle_timeout_secs>
+		<!-- Idle save and auto save are checked every 30 seconds -->
+		<!-- They are disabled when the value is zero or negative. -->
+		<idlesave_duration_secs default="30" desc="The number of idle seconds after which document, if modified, should be saved. Defaults to 30 seconds." type="int">30</idlesave_duration_secs>
+		<autosave_duration_secs default="300" desc="The number of seconds after which document, if modified, should be saved. Defaults to 5 minutes." type="int">300</autosave_duration_secs>
+		<always_save_on_exit default="false" desc="On exiting the last editor, always perform the save, even if the document is not modified." type="bool">false</always_save_on_exit>
+		<limit_virt_mem_mb desc="The maximum virtual memory allowed to each document process. 0 for unlimited." type="uint">0</limit_virt_mem_mb>
+		<limit_stack_mem_kb desc="The maximum stack size allowed to each document process. 0 for unlimited." type="uint">8000</limit_stack_mem_kb>
+		<limit_file_size_mb desc="The maximum file size allowed to each document process to write. 0 for unlimited." type="uint">0</limit_file_size_mb>
+		<limit_num_open_files desc="The maximum number of files allowed to each document process to open. 0 for unlimited." type="uint">0</limit_num_open_files>
+		<limit_load_secs default="100" desc="Maximum number of seconds to wait for a document load to succeed. 0 for unlimited." type="uint">100</limit_load_secs>
+		<limit_convert_secs default="100" desc="Maximum number of seconds to wait for a document conversion to succeed. 0 for unlimited." type="uint">100</limit_convert_secs>
+		<cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="true">
+			<cleanup_interval_ms default="10000" desc="Interval between two checks" type="uint">10000</cleanup_interval_ms>
+			<bad_behavior_period_secs default="60" desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint">60</bad_behavior_period_secs>
+			<idle_time_secs default="300" desc="Minimum idle time for a document to be candidate for bad state" type="uint">300</idle_time_secs>
+			<limit_dirty_mem_mb default="3072" desc="Minimum memory usage for a document to be candidate for bad state" type="uint">3072</limit_dirty_mem_mb>
+			<limit_cpu_per default="85" desc="Minimum CPU usage for a document to be candidate for bad state" type="uint">85</limit_cpu_per>
+			<lost_kit_grace_period_secs default="120" desc="The minimum grace period for a lost kit process (not referenced by coolwsd) to resolve its lost status before it is terminated. To disable the cleanup of lost kits use value 0">120</lost_kit_grace_period_secs>
+		</cleanup>
+	</per_document>
+	<per_view desc="View-specific settings.">
+		<out_of_focus_timeout_secs default="120" desc="The maximum number of seconds before dimming and stopping updates when the browser tab is no longer in focus. Defaults to 120 seconds." type="uint">120</out_of_focus_timeout_secs>
+		<idle_timeout_secs default="900" desc="The maximum number of seconds before dimming and stopping updates when the user is no longer active (even if the browser is in focus). Defaults to 15 minutes." type="uint">900</idle_timeout_secs>
+	</per_view>
+	<ver_suffix default="" desc="Appended to etags to allow easy refresh of changed files during development" type="string"/>
+	<logging>
+		<color type="bool">true</color>
+		<!--
              Note to developers: When you do "make run", the logging.level will be set on the
              coolwsd command line, so if you want to change it for your testing, do it in
              Makefile.am, not here.
         -->
-        <level type="string" desc="Can be 0-8 (with the lowest numbers being the least verbose), or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="warning">warning</level>
-        <most_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from the client can not set a more verbose log level than this" default="notice">notice</most_verbose_level_settable_from_client>
-        <least_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from a client can not set a less verbose log level than this" default="fatal">fatal</least_verbose_level_settable_from_client>
-        <protocol type="bool" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
-        <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
+		<level default="warning" desc="Can be 0-8 (with the lowest numbers being the least verbose), or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" type="string">debug</level>
+		<most_verbose_level_settable_from_client default="notice" desc="A loggingleveloverride message from the client can not set a more verbose log level than this" type="string">notice</most_verbose_level_settable_from_client>
+		<least_verbose_level_settable_from_client default="fatal" desc="A loggingleveloverride message from a client can not set a less verbose log level than this" type="string">fatal</least_verbose_level_settable_from_client>
+		<protocol desc="Enable minimal client-site JS protocol logging from the start" type="bool">false</protocol>
+		<!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
              See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
-        <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
-        <file enable="false">
-            <!-- If you use other path than /var/log and you run coolwsd from systemd, make sure that you enable that path in coolwsd.service (ReadWritePaths). -->
-            <property name="path" desc="Log file path.">/var/log/coolwsd.log</property>
-            <property name="rotation" desc="Log file rotation strategy. See Poco FileChannel.">never</property>
-            <property name="archive" desc="Append either timestamp or number to the archived log filename.">timestamp</property>
-            <property name="compress" desc="Enable/disable log file compression.">true</property>
-            <property name="purgeAge" desc="The maximum age of log files to preserve. See Poco FileChannel.">10 days</property>
-            <property name="purgeCount" desc="The maximum number of log archives to preserve. Use 'none' to disable purging. See Poco FileChannel.">10</property>
-            <property name="rotateOnOpen" desc="Enable/disable log file rotation on opening.">true</property>
-            <property name="flush" desc="Enable/disable flushing after logging each line. May harm performance. Note that without flushing after each line, the log lines from the different processes will not appear in chronological order.">false</property>
-        </file>
-        <anonymize>
-            <anonymize_user_data type="bool" desc="Enable to anonymize/obfuscate of user-data in logs. If default is true, it was forced at compile-time and cannot be disabled." default="false">false</anonymize_user_data>
-            <anonymization_salt type="uint" desc="The salt used to anonymize/obfuscate user-data in logs. Use a secret 64-bit random number." default="82589933">82589933</anonymization_salt>
-        </anonymize>
-    </logging>
-
-    <!--
+		<lokit_sal_log default="-INFO-WARN" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." type="string">-INFO-WARN</lokit_sal_log>
+		<file enable="true">
+			<!-- If you use other path than /var/log and you run coolwsd from systemd, make sure that you enable that path in coolwsd.service (ReadWritePaths). -->
+			<property desc="Log file path." name="path">/var/log/coolwsd.log</property>
+			<property desc="Log file rotation strategy. See Poco FileChannel." name="rotation">never</property>
+			<property desc="Append either timestamp or number to the archived log filename." name="archive">timestamp</property>
+			<property desc="Enable/disable log file compression." name="compress">true</property>
+			<property desc="The maximum age of log files to preserve. See Poco FileChannel." name="purgeAge">10 days</property>
+			<property desc="The maximum number of log archives to preserve. Use 'none' to disable purging. See Poco FileChannel." name="purgeCount">10</property>
+			<property desc="Enable/disable log file rotation on opening." name="rotateOnOpen">true</property>
+			<property desc="Enable/disable flushing after logging each line. May harm performance. Note that without flushing after each line, the log lines from the different processes will not appear in chronological order." name="flush">true</property>
+		</file>
+		<anonymize>
+			<anonymize_user_data default="false" desc="Enable to anonymize/obfuscate of user-data in logs. If default is true, it was forced at compile-time and cannot be disabled." type="bool">false</anonymize_user_data>
+			<anonymization_salt default="82589933" desc="The salt used to anonymize/obfuscate user-data in logs. Use a secret 64-bit random number." type="uint">82589933</anonymization_salt>
+		</anonymize>
+		<docstats default="false" desc="Enable to see document handling information in logs." type="bool">false</docstats>
+	</logging>
+	<!--
          Note to developers: When you do "make run", the trace_event[@enable] will be set on the
          coolwsd command line, so if you want to change it for your testing, do it in Makefile.am,
          not here.
     -->
-    <trace_event desc="The possibility to turn on generation of a Chrome Trace Event file" enable="false">
-        <path desc="Output path for the Trace Event file, to which they will be written if turned on at run-time" type="string" default="/var/log/coolwsd.trace.json">/var/log/coolwsd.trace.json</path>
-    </trace_event>
-
-    <browser_logging desc="Logging in the browser console" default="false">false</browser_logging>
-
-    <trace desc="Dump commands and notifications for replay. When 'snapshot' is true, the source file is copied to the path first." enable="false">
-        <path desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/cooltrace-%.gz" compress="true" snapshot="false"></path>
-        <filter>
-            <message desc="Regex pattern of messages to exclude"></message>
-        </filter>
-        <outgoing>
-            <record desc="Whether or not to record outgoing messages" default="false">false</record>
-        </outgoing>
-    </trace>
-
-    <net desc="Network settings">
-      <!-- On systems where localhost resolves to IPv6 [::1] address first, when net.proto is all and net.listen is loopback, coolwsd unexpectedly listens on [::1] only.
+	<trace_event desc="The possibility to turn on generation of a Chrome Trace Event file" enable="false">
+		<path default="/var/log/coolwsd.trace.json" desc="Output path for the Trace Event file, to which they will be written if turned on at run-time" type="string">/var/log/coolwsd.trace.json</path>
+	</trace_event>
+	<browser_logging default="false" desc="Logging in the browser console">false</browser_logging>
+	<trace desc="Dump commands and notifications for replay. When 'snapshot' is true, the source file is copied to the path first." enable="false">
+		<path compress="true" desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/cooltrace-%.gz" snapshot="false"/>
+		<filter>
+			<message desc="Regex pattern of messages to exclude"/>
+		</filter>
+		<outgoing>
+			<record default="false" desc="Whether or not to record outgoing messages">false</record>
+		</outgoing>
+	</trace>
+	<net desc="Network settings">
+		<!-- On systems where localhost resolves to IPv6 [::1] address first, when net.proto is all and net.listen is loopback, coolwsd unexpectedly listens on [::1] only.
            You need to change net.proto to IPv4, if you want to use 127.0.0.1. -->
-      <proto type="string" default="all" desc="Protocol to use IPv4, IPv6 or all for both">all</proto>
-      <listen type="string" default="any" desc="Listen address that coolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
-      <!-- this allows you to shift all of our URLs into a sub-path from
+		<proto default="all" desc="Protocol to use IPv4, IPv6 or all for both" type="string">all</proto>
+		<listen default="any" desc="Listen address that coolwsd binds to. Can be 'any' or 'loopback'." type="string">any</listen>
+		<!-- this allows you to shift all of our URLs into a sub-path from
            https://my.com/browser/a123... to https://my.com/my/sub/path/browser/a123... -->
-      <service_root type="path" default="" desc="Prefix all the pages, websockets, etc. with this path."></service_root>
-      <post_allow desc="Allow/deny client IP address for POST(REST)." allow="true">
-        <host desc="The IPv4 private 192.168 block as plain IPv4 dotted decimal addresses.">192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="The IPv4 loopback (localhost) address.">127\.0\.0\.1</host>
-        <host desc="Ditto, but as IPv4-mapped IPv6 address">::ffff:127\.0\.0\.1</host>
-        <host desc="The IPv6 loopback (localhost) address.">::1</host>
-        <host desc="The IPv4 private 172.16.0.0/12 subnet part 1.">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="The IPv4 private 172.16.0.0/12 subnet part 2.">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="The IPv4 private 172.16.0.0/12 subnet part 3.">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
-        <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
-      </post_allow>
-      <frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
-      <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
-
-      <!-- this setting radically changes how online works, it should not be used in a production environment -->
-      <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
-    </net>
-
-    <ssl desc="SSL settings">
-        <!-- switches from https:// + wss:// to http:// + ws:// -->
-        <enable type="bool" desc="Controls whether SSL encryption between coolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="true">true</enable>
-        <!-- SSL off-load can be done in a proxy, if so disable SSL, and enable termination below in production -->
-        <termination desc="Connection via proxy where coolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
-        <cert_file_path desc="Path to the cert file" relative="false">/etc/coolwsd/cert.pem</cert_file_path>
-        <key_file_path desc="Path to the key file" relative="false">/etc/coolwsd/key.pem</key_file_path>
-        <ca_file_path desc="Path to the ca file" relative="false">/etc/coolwsd/ca-chain.cert.pem</ca_file_path>
-        <cipher_list desc="List of OpenSSL ciphers to accept" default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"></cipher_list>
-        <hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false">
-            <max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age>
-            <report_uri desc="HPKP's report-uri directive - pin validation failure are reported at this URL" enable="false"></report_uri>
-            <pins desc="Base64 encoded SPKI fingerprints of keys to be pinned">
-            <pin></pin>
-            </pins>
-        </hpkp>
-        <sts desc="Strict-Transport-Security settings, per rfc6797. Subdomains are always included.">
-            <enabled desc="Whether or not Strict-Transport-Security is enabled. Enable only when ready for production. Cannot be disabled without resetting the browsers." type="bool" default="false">false</enabled>
-            <max_age desc="Strict-Transport-Security max-age directive, in seconds. 0 is allowed; please see rfc6797 for details. Defaults to 1 year." type="int" default="31536000">31536000</max_age>
-        </sts>
-    </ssl>
-
-    <security desc="Altering these defaults potentially opens you to significant risk">
-      <seccomp desc="Should we use the seccomp system call filtering." type="bool" default="true">true</seccomp>
-      <capabilities desc="Should we require capabilities to isolate processes into chroot jails" type="bool" default="true">true</capabilities>
-      <jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
-      <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">false</enable_macros_execution>
-      <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">1</macro_security_level>
-      <enable_metrics_unauthenticated desc="When enabled, the /cool/getMetrics endpoint will not require authentication." type="bool" default="false">false</enable_metrics_unauthenticated>
-    </security>
-
-    <certificates>
-      <database_path type="string" desc="Path to the NSS certificates that are used for signing documents" default=""></database_path>
-    </certificates>
-
-    <watermark>
-      <opacity desc="Opacity of on-screen watermark from 0.0 to 1.0" type="double" default="0.2"></opacity>
-      <text desc="Watermark text to be displayed on the document if entered" type="string"></text>
-    </watermark>
-
-    <welcome>
-      <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">true</enable>
-      <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
-      <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="browser/welcome"></path>
-    </welcome>
-
-    <user_interface>
-      <mode type="string" desc="Controls the user interface style. The 'default' means: Take the value from ui_defaults, or decide for one of classic or notebookbar (default|classic|notebookbar)" default="default">default</mode>
-    </user_interface>
-
-    <storage desc="Backend storage">
-        <filesystem allow="false" />
-        <wopi desc="Allow/deny wopi storage." allow="true">
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">localhost</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="false">192\.168\.1\.1</host>
-            <max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
-            <locking desc="Locking settings">
-                <refresh desc="How frequently we should re-acquire a lock with the storage server, in seconds (default 15 mins) or 0 for no refresh" type="int" default="900">900</refresh>
-            </locking>
-        </wopi>
-        <ssl desc="SSL settings">
-            <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
-            <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and coolwsd. When empty this defaults to following the ssl.enable setting"></enable>
-            <cert_file_path desc="Path to the cert file" relative="false"></cert_file_path>
-            <key_file_path desc="Path to the key file" relative="false"></key_file_path>
-            <ca_file_path desc="Path to the ca file. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." relative="false"></ca_file_path>
-            <cipher_list desc="List of OpenSSL ciphers to accept. If empty the defaults are used. These can be overridden only if absolutely needed."></cipher_list>
-        </ssl>
-    </storage>
-
-    <tile_cache_persistent desc="Should the tiles persist between two editing sessions of the given document?" type="bool" default="true">true</tile_cache_persistent>
-
-    <admin_console desc="Web admin console settings.">
-        <enable desc="Enable the admin console functionality" type="bool" default="true">true</enable>
-        <enable_pam desc="Enable admin user authentication with PAM" type="bool" default="false">false</enable_pam>
-        <username desc="The username of the admin console. Ignored if PAM is enabled."></username>
-        <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or coolconfig to set up a secure password."></password>
-    </admin_console>
-
-    <monitors desc="Addresses of servers we connect to on start for monitoring">
-    </monitors>
-
-    <quarantine_files desc="Files are stored here to be examined later in cases of crashes or similar situation." default="false" enable="false">
-        <limit_dir_size_mb desc="Maximum directory size. On exceeding the specified limit, older files will be deleted." default="250" type="uint"></limit_dir_size_mb>
-        <max_versions_to_maintain desc="How many versions of the same file to keep." default="2" type="uint"></max_versions_to_maintain>
-        <path desc="Path to directory under which quarantined files will be stored" type="path" relative="true" default="quarantine"></path>
-        <expiry_min desc="Time in mins after quarantined files will be deleted." type="int" default="30"></expiry_min>
-    </quarantine_files>
-
-    
-
-    
-
+		<service_root default="" desc="Prefix all the pages, websockets, etc. with this path." type="path"/>
+		<post_allow allow="true" desc="Allow/deny client IP address for POST(REST).">
+			<host desc="The IPv4 private 192.168 block as plain IPv4 dotted decimal addresses.">192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="The IPv4 loopback (localhost) address.">127\.0\.0\.1</host>
+			<host desc="Ditto, but as IPv4-mapped IPv6 address">::ffff:127\.0\.0\.1</host>
+			<host desc="The IPv6 loopback (localhost) address.">::1</host>
+			<host desc="The IPv4 private 172.16.0.0/12 subnet part 1.">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="The IPv4 private 172.16.0.0/12 subnet part 2.">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="The IPv4 private 172.16.0.0/12 subnet part 3.">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
+		</post_allow>
+		<frame_ancestors desc="Specify who is allowed to embed the Collabora Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."/>
+		<connection_timeout_secs default="30" desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int"/>
+		<!-- this setting radically changes how online works, it should not be used in a production environment -->
+		<proxy_prefix default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests" type="bool"/>
+	</net>
+	<ssl desc="SSL settings">
+		<!-- switches from https:// + wss:// to http:// + ws:// -->
+		<enable default="true" desc="Controls whether SSL encryption between coolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." type="bool">true</enable>
+		<!-- SSL off-load can be done in a proxy, if so disable SSL, and enable termination below in production -->
+		<termination default="true" desc="Connection via proxy where coolwsd acts as working via https, but actually uses http." type="bool">false</termination>
+		<cert_file_path desc="Path to the cert file" relative="false">/etc/coolwsd/cert.pem</cert_file_path>
+		<key_file_path desc="Path to the key file" relative="false">/etc/coolwsd/key.pem</key_file_path>
+		<ca_file_path desc="Path to the ca file" relative="false">/etc/coolwsd/ca-chain.cert.pem</ca_file_path>
+		<cipher_list default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" desc="List of OpenSSL ciphers to accept"/>
+		<hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false">
+			<max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age>
+			<report_uri desc="HPKP's report-uri directive - pin validation failure are reported at this URL" enable="false"/>
+			<pins desc="Base64 encoded SPKI fingerprints of keys to be pinned">
+				<pin/>
+			</pins>
+		</hpkp>
+		<sts desc="Strict-Transport-Security settings, per rfc6797. Subdomains are always included.">
+			<enabled default="false" desc="Whether or not Strict-Transport-Security is enabled. Enable only when ready for production. Cannot be disabled without resetting the browsers." type="bool">false</enabled>
+			<max_age default="31536000" desc="Strict-Transport-Security max-age directive, in seconds. 0 is allowed; please see rfc6797 for details. Defaults to 1 year." type="int">31536000</max_age>
+		</sts>
+	</ssl>
+	<security desc="Altering these defaults potentially opens you to significant risk">
+		<seccomp default="true" desc="Should we use the seccomp system call filtering." type="bool">true</seccomp>
+		<capabilities default="true" desc="Should we require capabilities to isolate processes into chroot jails" type="bool">true</capabilities>
+		<jwt_expiry_secs default="1800" desc="Time in seconds before the Admin Console's JWT token expires" type="int">1800</jwt_expiry_secs>
+		<enable_macros_execution default="false" desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool">false</enable_macros_execution>
+		<macro_security_level default="1" desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int">1</macro_security_level>
+		<enable_metrics_unauthenticated default="false" desc="When enabled, the /cool/getMetrics endpoint will not require authentication." type="bool">false</enable_metrics_unauthenticated>
+	</security>
+	<certificates>
+		<database_path default="" desc="Path to the NSS certificates that are used for signing documents" type="string"/>
+	</certificates>
+	<watermark>
+		<opacity default="0.2" desc="Opacity of on-screen watermark from 0.0 to 1.0" type="double"/>
+		<text desc="Watermark text to be displayed on the document if entered" type="string"/>
+	</watermark>
+	<welcome>
+		<enable default="true" desc="Controls whether the welcome screen should be shown to the users on new install and updates." type="bool">true</enable>
+		<enable_button default="false" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." type="bool">false</enable_button>
+		<path default="browser/welcome" desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." relative="true" type="path"/>
+	</welcome>
+	<user_interface>
+		<mode default="default" desc="Controls the user interface style. The 'default' means: Take the value from ui_defaults, or decide for one of classic or notebookbar (default|classic|notebookbar)" type="string">default</mode>
+	</user_interface>
+	<storage desc="Backend storage">
+		<filesystem allow="false"/>
+		<wopi allow="true" desc="Allow/deny wopi storage.">
+			<max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
+			<locking desc="Locking settings">
+				<refresh default="900" desc="How frequently we should re-acquire a lock with the storage server, in seconds (default 15 mins) or 0 for no refresh" type="int">900</refresh>
+			</locking>
+			<host allow="true" desc="Regex pattern of hostname to allow or deny.">localhost</host>
+			<host allow="true" desc="Regex pattern of hostname to allow or deny.">homecloud\.hoellein\.online</host>
+			<host allow="true" desc="Regex pattern of hostname to allow or deny.">homecollabora\.hoellein\.online</host>
+			<host allow="true" desc="Regex pattern of hostname to allow or deny.">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host allow="true" desc="Regex pattern of hostname to allow or deny.">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host allow="true" desc="Regex pattern of hostname to allow or deny.">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host allow="true" desc="Regex pattern of hostname to allow or deny.">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host allow="true" desc="Regex pattern of hostname to allow or deny.">192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
+			<host allow="false" desc="Regex pattern of hostname to allow or deny.">192\.168\.1\.1</host>
+		</wopi>
+		<ssl desc="SSL settings">
+			<as_scheme default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage" type="bool">true</as_scheme>
+			<enable desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and coolwsd. When empty this defaults to following the ssl.enable setting" type="bool"/>
+			<cert_file_path desc="Path to the cert file" relative="false"/>
+			<key_file_path desc="Path to the key file" relative="false"/>
+			<ca_file_path desc="Path to the ca file. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." relative="false"/>
+			<cipher_list desc="List of OpenSSL ciphers to accept. If empty the defaults are used. These can be overridden only if absolutely needed."/>
+		</ssl>
+	</storage>
+	<tile_cache_persistent default="true" desc="Should the tiles persist between two editing sessions of the given document?" type="bool">true</tile_cache_persistent>
+	<admin_console desc="Web admin console settings.">
+		<enable default="true" desc="Enable the admin console functionality" type="bool">true</enable>
+		<enable_pam default="false" desc="Enable admin user authentication with PAM" type="bool">false</enable_pam>
+		<username desc="The username of the admin console. Ignored if PAM is enabled.">admin</username>
+		<password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or coolconfig to set up a secure password."/>
+		<secure_password>pbkdf2.sha512.10000.54506d4d97532e8ee4d72f145b1982de106647650ec5e3f6284cc62230aabdf8543789f9a51542be239158f3d489d85cfffe5c635e4752918c9378a6ec0b8fe9f88c31d925670009c1245e0121dca9804038dccb97a25301389a448afc422cff42c02f4f6463cb1185eeb4334b83dab6891f9b6412417effd11a8dbe407578ea.5d7517827580225aa18360aef95830d43361cf7fc87750ad4b7f75c4121ea8d303d3701aa92f521512b12837d7798a5546fa2a0b6ea45811535af1afea0ef6bcac2ca1c8aa0c19a7bc664139e54ad8efccd1f49a37a4984cef226923aa895e162d712ec8ef77736d5f227cb127e0e6f1ecf4d66b64179be21a1a115f882e9b21</secure_password>
+	</admin_console>
+	<monitors desc="Addresses of servers we connect to on start for monitoring"/>
+	<quarantine_files default="false" desc="Files are stored here to be examined later in cases of crashes or similar situation." enable="false">
+		<limit_dir_size_mb default="250" desc="Maximum directory size. On exceeding the specified limit, older files will be deleted." type="uint"/>
+		<max_versions_to_maintain default="2" desc="How many versions of the same file to keep." type="uint"/>
+		<path default="quarantine" desc="Path to directory under which quarantined files will be stored" relative="true" type="path"/>
+		<expiry_min default="30" desc="Time in mins after quarantined files will be deleted." type="int"/>
+	</quarantine_files>
 </config>
diff --git a/loolwsd/loolwsd.xml b/loolwsd/loolwsd.xml.migrated
similarity index 100%
rename from loolwsd/loolwsd.xml
rename to loolwsd/loolwsd.xml.migrated
-- 
2.43.0