From 517c607137064e74ea69fc23df568fef5c8d3d4b Mon Sep 17 00:00:00 2001
From: mhoellein <mhoellein@freenet.de>
Date: Wed, 24 Oct 2018 12:47:13 +0200
Subject: [PATCH] committing changes in /etc after apt run

Package changes:
+code-brand 3.4-1 all
+collaboraoffice5.3 5.3.10.57-57 amd64
+collaboraoffice5.3-ure 5.3.10.57-57 amd64
+collaboraofficebasis5.3-calc 5.3.10.57-57 amd64
+collaboraofficebasis5.3-core 5.3.10.57-57 amd64
+collaboraofficebasis5.3-draw 5.3.10.57-57 amd64
+collaboraofficebasis5.3-en-us 5.3.10.57-57 amd64
+collaboraofficebasis5.3-en-us-calc 5.3.10.57-57 amd64
+collaboraofficebasis5.3-en-us-res 5.3.10.57-57 amd64
+collaboraofficebasis5.3-extension-pdf-import 5.3.10.57-57 amd64
+collaboraofficebasis5.3-filter-data 5.3.10.57-57 amd64
+collaboraofficebasis5.3-graphicfilter 5.3.10.57-57 amd64
+collaboraofficebasis5.3-images 5.3.10.57-57 amd64
+collaboraofficebasis5.3-impress 5.3.10.57-57 amd64
+collaboraofficebasis5.3-noto-fonts 5.3.10.57-57 amd64
+collaboraofficebasis5.3-ooofonts 5.3.10.57-57 amd64
+collaboraofficebasis5.3-ooolinguistic 5.3.10.57-57 amd64
+collaboraofficebasis5.3-writer 5.3.10.57-57 amd64
+libpococrypto50 1.8.0.1-1ubuntu4 amd64
+libpocofoundation50 1.8.0.1-1ubuntu4 amd64
+libpocojson50 1.8.0.1-1ubuntu4 amd64
+libpoconet50 1.8.0.1-1ubuntu4 amd64
+libpoconetssl50 1.8.0.1-1ubuntu4 amd64
+libpocoutil50 1.8.0.1-1ubuntu4 amd64
+libpocoxml50 1.8.0.1-1ubuntu4 amd64
+loolwsd 3.4.0-8 amd64
---
 .etckeeper                                    |   7 +
 apt/apt.conf.d/25loolwsd                      |   2 +
 cron.d/loolwsd                                |   1 +
 group                                         |   1 +
 group-                                        |   1 +
 gshadow                                       |   1 +
 gshadow-                                      |   1 +
 loolwsd/loolkitconfig.xcu                     |  16 +++
 loolwsd/loolwsd.xml                           | 132 ++++++++++++++++++
 passwd                                        |   1 +
 passwd-                                       |   1 +
 shadow                                        |   1 +
 shadow-                                       |   1 +
 .../multi-user.target.wants/loolwsd.service   |   1 +
 14 files changed, 167 insertions(+)
 create mode 100644 apt/apt.conf.d/25loolwsd
 create mode 100644 cron.d/loolwsd
 create mode 100644 loolwsd/loolkitconfig.xcu
 create mode 100644 loolwsd/loolwsd.xml
 create mode 120000 systemd/system/multi-user.target.wants/loolwsd.service

diff --git a/.etckeeper b/.etckeeper
index 3740a23d..b75243c5 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -740,6 +740,7 @@ maybe chmod 0444 'apt/apt.conf.d/01autoremove-kernels'
 maybe chmod 0644 'apt/apt.conf.d/05etckeeper'
 maybe chmod 0644 'apt/apt.conf.d/20auto-upgrades'
 maybe chmod 0644 'apt/apt.conf.d/20dbus'
+maybe chmod 0644 'apt/apt.conf.d/25loolwsd'
 maybe chmod 0644 'apt/apt.conf.d/50command-not-found'
 maybe chmod 0644 'apt/apt.conf.d/50unattended-upgrades'
 maybe chmod 0644 'apt/apt.conf.d/70debconf'
@@ -1982,6 +1983,7 @@ maybe chmod 0644 'cron.d/.placeholder'
 maybe chmod 0644 'cron.d/amavisd-new'
 maybe chmod 0644 'cron.d/anacron'
 maybe chmod 0644 'cron.d/certbot'
+maybe chmod 0644 'cron.d/loolwsd'
 maybe chmod 0644 'cron.d/networkfix'
 maybe chmod 0644 'cron.d/php'
 maybe chmod 0644 'cron.d/php5'
@@ -3405,6 +3407,11 @@ maybe chmod 0644 'logrotate.d/unattended-upgrades'
 maybe chmod 0644 'logrotate.d/unifi'
 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 chmod 0644 'lsb-release'
 maybe chmod 0644 'ltrace.conf'
 maybe chmod 0755 'lvm'
diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd
new file mode 100644
index 00000000..f61f969e
--- /dev/null
+++ b/apt/apt.conf.d/25loolwsd
@@ -0,0 +1,2 @@
+// Rebuild systemplate of LibreOffice Online
+DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.3 >/dev/null 2>&1'"; };
diff --git a/cron.d/loolwsd b/cron.d/loolwsd
new file mode 100644
index 00000000..761029b9
--- /dev/null
+++ b/cron.d/loolwsd
@@ -0,0 +1 @@
+0 0 */1 * * root find /var/cache/loolwsd -type f -a -atime +10 -exec rm {} \;
diff --git a/group b/group
index 05debeb3..6d7399a9 100644
--- a/group
+++ b/group
@@ -100,3 +100,4 @@ lightdm:x:154:
 Debian-snmp:x:121:
 rdma:x:151:
 geoclue:x:155:
+lool:x:156:
diff --git a/group- b/group-
index 39db587b..05debeb3 100644
--- a/group-
+++ b/group-
@@ -99,3 +99,4 @@ mosquitto:x:153:
 lightdm:x:154:
 Debian-snmp:x:121:
 rdma:x:151:
+geoclue:x:155:
diff --git a/gshadow b/gshadow
index ede24921..2910f44b 100644
--- a/gshadow
+++ b/gshadow
@@ -100,3 +100,4 @@ lightdm:!::
 Debian-snmp:!::
 rdma:!::
 geoclue:!::
+lool:!::
diff --git a/gshadow- b/gshadow-
index 42b9d4f8..ede24921 100644
--- a/gshadow-
+++ b/gshadow-
@@ -99,3 +99,4 @@ mosquitto:!::
 lightdm:!::
 Debian-snmp:!::
 rdma:!::
+geoclue:!::
diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu
new file mode 100644
index 00000000..a80508aa
--- /dev/null
+++ b/loolwsd/loolkitconfig.xcu
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<!-- tdf#106488 - reverse hostname lookup can go badly wrong -->
+<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="UseLocking" oor:op="fuse"><value>false</value></prop></item>
+
+<!-- Enable spell-checking by default -->
+<item oor:path="/org.openoffice.Office.Linguistic/SpellChecking"><prop oor:name="IsSpellAuto" oor:op="fuse"><value>true</value></prop></item>
+
+<!-- Save memory by avoiding collecting autocompletion words  -->
+<item oor:path="/org.openoffice.Office.Writer/AutoFunction/Completion"><prop oor:name="Enable" oor:op="fuse"><value>false</value></prop></item>
+
+<!-- Set a work path which is valid in chroot -->
+<item oor:path="/org.openoffice.Office.Paths/Variables"><prop oor:name="Work" oor:op="fuse"><value>file:///tmp</value></prop></item>
+
+</oor:items>
diff --git a/loolwsd/loolwsd.xml b/loolwsd/loolwsd.xml
new file mode 100644
index 00000000..28b5f089
--- /dev/null
+++ b/loolwsd/loolwsd.xml
@@ -0,0 +1,132 @@
+<config>
+
+    <!-- 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 on this instance." 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>
+
+    <tile_cache_path desc="Path to a directory where to keep the tile cache." type="path" relative="false" default="/var/cache/loolwsd"></tile_cache_path>
+    <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>
+    <lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="/opt/collaboraoffice5.3"></lo_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>
+
+    <server_name desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." 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 loleaflet." type="path" relative="true" default="loleaflet/../"></file_server_root_path>
+
+    <memproportion desc="The maximum percentage of system memory consumed by all of the LibreOffice Online, 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>
+        <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 -->
+        <idlesave_duration_secs desc="The number of idle seconds after which document, if modified, should be saved. Defaults to 30 seconds." type="uint" 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="uint" default="300">300</autosave_duration_secs>
+        <limit_virt_mem_kb desc="The maximum virtual memory allowed to each document process. 0 for unlimited, 1700 min." type="uint">0</limit_virt_mem_kb>
+        <limit_data_mem_kb desc="The maximum memory data segment allowed to each document process. 0 for unlimited." type="uint">0</limit_data_mem_kb>
+        <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>
+    </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 60 seconds." type="uint" default="60">60</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>
+
+    <loleaflet_html desc="Allows UI customization by replacing the single endpoint of loleaflet.html" type="string" default="loleaflet.html">loleaflet.html</loleaflet_html>
+
+    <logging>
+        <color type="bool">true</color>
+        <level type="string" desc="Can be 0-8, or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="warning">warning</level>
+        <file enable="false">
+            <property name="path" desc="Log file path.">/var/log/loolwsd.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>
+            <filenames type="bool" desc="Enable to anonymize/obfuscate filenames in logs. If default is true, it was forced at compile-time and cannot be disabled." default="false">false</filenames>
+            <usernames type="bool" desc="Enable to anonymize/obfuscate usernames in logs. If default is true, it was forced at compile-time and cannot be disabled." default="false">false</usernames>
+        </anonymize>
+    </logging>
+
+    <loleaflet_logging desc="Logging in the browser console" default="false">false</loleaflet_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/looltrace-%.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">
+      <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 loolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
+      <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>
+      </post_allow>
+    </net>
+
+    <ssl desc="SSL settings">
+        <enable type="bool" default="true">true</enable>
+        <termination desc="Connection via proxy where loolwsd 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/loolwsd/cert.pem</cert_file_path>
+        <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
+        <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/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>
+    </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>
+    </security>
+
+    <storage desc="Backend storage">
+        <filesystem allow="false" />
+        <wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." 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>
+        </wopi>
+        <webdav desc="Allow/deny webdav storage. Mutually exclusive with wopi." allow="false">
+            <host desc="Hostname to allow" allow="false">localhost</host>
+        </webdav>
+    </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 loolconfig to set up a secure password."></password>
+    </admin_console>
+
+    <monitors desc="Addresses of servers we connect to on start for monitoring">
+    </monitors>
+
+</config>
diff --git a/passwd b/passwd
index 78ebb2d7..ffb2b572 100644
--- a/passwd
+++ b/passwd
@@ -73,3 +73,4 @@ lightdm:x:147:154:Light Display Manager:/var/lib/lightdm:/bin/false
 cups-pk-helper:x:111:108:user for cups-pk-helper service,,,:/home/cups-pk-helper:/usr/sbin/nologin
 Debian-snmp:x:145:121::/var/lib/snmp:/bin/false
 geoclue:x:148:155::/var/lib/geoclue:/usr/sbin/nologin
+lool:x:149:156::/opt/lool:/usr/sbin/nologin
diff --git a/passwd- b/passwd-
index 78ebb2d7..ffb2b572 100644
--- a/passwd-
+++ b/passwd-
@@ -73,3 +73,4 @@ lightdm:x:147:154:Light Display Manager:/var/lib/lightdm:/bin/false
 cups-pk-helper:x:111:108:user for cups-pk-helper service,,,:/home/cups-pk-helper:/usr/sbin/nologin
 Debian-snmp:x:145:121::/var/lib/snmp:/bin/false
 geoclue:x:148:155::/var/lib/geoclue:/usr/sbin/nologin
+lool:x:149:156::/opt/lool:/usr/sbin/nologin
diff --git a/shadow b/shadow
index a6f0cc5d..a1410950 100644
--- a/shadow
+++ b/shadow
@@ -73,3 +73,4 @@ lightdm:*:17827:0:99999:7:::
 cups-pk-helper:*:17827:0:99999:7:::
 Debian-snmp:!:17827:0:99999:7:::
 geoclue:*:17827:0:99999:7:::
+lool:*:17828:0:99999:7:::
diff --git a/shadow- b/shadow-
index a6f0cc5d..a1410950 100644
--- a/shadow-
+++ b/shadow-
@@ -73,3 +73,4 @@ lightdm:*:17827:0:99999:7:::
 cups-pk-helper:*:17827:0:99999:7:::
 Debian-snmp:!:17827:0:99999:7:::
 geoclue:*:17827:0:99999:7:::
+lool:*:17828:0:99999:7:::
diff --git a/systemd/system/multi-user.target.wants/loolwsd.service b/systemd/system/multi-user.target.wants/loolwsd.service
new file mode 120000
index 00000000..032b72f3
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/loolwsd.service
@@ -0,0 +1 @@
+/lib/systemd/system/loolwsd.service
\ No newline at end of file
-- 
2.43.0