From: mhoellein <mhoellein@freenet.de>
Date: Wed, 24 Oct 2018 22:06:05 +0000 (+0200)
Subject: daily autocommit
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=6751311af72ba05ba3d57cb7267cfdaf59905a58;p=homeserver

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index b75243c5..e1f122e7 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -3093,7 +3093,7 @@ maybe chmod 0700 'letsencrypt/accounts/acme-v01.api.letsencrypt.org/directory/68
 maybe chmod 0644 'letsencrypt/accounts/acme-v01.api.letsencrypt.org/directory/68cd3c6cd795fdbdaf6878faa17c3290/meta.json'
 maybe chmod 0400 'letsencrypt/accounts/acme-v01.api.letsencrypt.org/directory/68cd3c6cd795fdbdaf6878faa17c3290/private_key.json'
 maybe chmod 0644 'letsencrypt/accounts/acme-v01.api.letsencrypt.org/directory/68cd3c6cd795fdbdaf6878faa17c3290/regr.json'
-maybe chmod 0700 'letsencrypt/archive'
+maybe chmod 0755 'letsencrypt/archive'
 maybe chmod 0755 'letsencrypt/archive/ck.moellein.homeip.net'
 maybe chmod 0644 'letsencrypt/archive/ck.moellein.homeip.net/cert1.pem'
 maybe chmod 0644 'letsencrypt/archive/ck.moellein.homeip.net/cert2.pem'
@@ -3281,7 +3281,7 @@ maybe chmod 0600 'letsencrypt/keys/0042_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0043_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0044_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0045_key-certbot.pem'
-maybe chmod 0700 'letsencrypt/live'
+maybe chmod 0755 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/ck.moellein.homeip.net'
 maybe chmod 0644 'letsencrypt/live/ck.moellein.homeip.net/README'
 maybe chmod 0755 'letsencrypt/live/gitweb.moellein.homeip.net'
diff --git a/apache2/mods-available/proxy.conf b/apache2/mods-available/proxy.conf
index 786ccd5c..c631628b 100644
--- a/apache2/mods-available/proxy.conf
+++ b/apache2/mods-available/proxy.conf
@@ -24,25 +24,25 @@
 ProxyRequests Off
 
 
-        <Proxy *>
-
-                AddDefaultCharset off
-
-                AuthUserFile /etc/apache2/.htpasswd
-
-                AuthName EnterPassword
-
-                AuthType Basic
-
-                require user admin
-
-                Order deny,allow
-
-                Allow from all
-
-                #Allow from .example.com
-
-        </Proxy>
+#        <Proxy *>
+#
+#                AddDefaultCharset off
+#
+#                AuthUserFile /etc/apache2/.htpasswd
+#
+#                AuthName EnterPassword
+#
+#                AuthType Basic
+#
+#                require user admin
+#
+#                Order deny,allow
+#
+#                Allow from all
+#
+#                #Allow from .example.com
+#
+#        </Proxy>
 </IfModule>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/apache2/sites-available/ccu.conf b/apache2/sites-available/ccu.conf
index 3f6a7c53..0873284e 100644
--- a/apache2/sites-available/ccu.conf
+++ b/apache2/sites-available/ccu.conf
@@ -1,14 +1,14 @@
 <IfModule mod_ssl.c>
 	<VirtualHost *:443>
 		ServerAdmin mhoellein@freenet.de
-		ServerName ccu.moellein.homeip.net
+		ServerName ccu.moellein.homeip.net:443
 		ServerAlias ccu.moellein.homeip.net
 
 		ProxyRequests Off
 		<Proxy *>
 			AddDefaultCharset off
 			AuthUserFile /etc/apache2/.htpasswd
-			AuthName EnterPassword
+			AuthName "EnterPassword for ccu"
 			AuthType Basic
 			require user ccu
 			Order deny,allow
diff --git a/apache2/sites-available/ck.conf b/apache2/sites-available/ck.conf
index 0b248c14..bc4140a5 100644
--- a/apache2/sites-available/ck.conf
+++ b/apache2/sites-available/ck.conf
@@ -13,7 +13,7 @@
 	
 		<Proxy *>
 			AuthUserFile /etc/apache2/.htpasswd
-			AuthName EnterPassword
+			AuthName "Enter Password for ck"
 			AuthType Basic
 			require user ck
 			Order deny,allow
diff --git a/apache2/sites-available/collabora.conf b/apache2/sites-available/collabora.conf
index b67beaa9..a39f468a 100644
--- a/apache2/sites-available/collabora.conf
+++ b/apache2/sites-available/collabora.conf
@@ -1,6 +1,6 @@
 <VirtualHost *:443>
 	ServerName collabora.moellein.homeip.net:443
-	ServerAlias collabora.moellein.homeip.net
+#	ServerAlias collabora.moellein.homeip.net
 	Options -Indexes
 
 	# SSL configuration, you may want to take the easy route instead and use Lets Encrypt!
@@ -9,9 +9,6 @@
 	SSLProtocol all -SSLv2 -SSLv3
 	SSLCipherSuite ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
 	SSLHonorCipherOrder on
-	<Directory />
-		Require all granted
-	</Directory>
 	# Encoded slashes need to be allowed
 	AllowEncodedSlashes NoDecode
 	# Enable and configure SSL Proxy
@@ -41,6 +38,7 @@
 	# Download as, Fullscreen presentation and Image upload operations
 	ProxyPass /lool https://127.0.0.1:9980/lool
 	ProxyPassReverse /lool https://127.0.0.1:9980/lool
+
 	SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
 	SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
 	SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
diff --git a/apache2/sites-available/fhem.conf b/apache2/sites-available/fhem.conf
index 3548248f..ce2f83b3 100644
--- a/apache2/sites-available/fhem.conf
+++ b/apache2/sites-available/fhem.conf
@@ -1,14 +1,14 @@
 <IfModule mod_ssl.c>
 	<VirtualHost *:443>
 		ServerAdmin mhoellein@freenet.de
-		ServerName fhem.moellein.homeip.net
+		ServerName fhem.moellein.homeip.net:443
 		ServerAlias fhem.moellein.homeip.net
 
 		ProxyRequests Off
 		<Proxy *>
         	        AddDefaultCharset off
 	                AuthUserFile /etc/apache2/.htpasswd
-	                AuthName EnterPassword
+	                AuthName "Enter Password for fhem"
 	                AuthType Basic
 	                require user fhem 
 #	                Order deny,allow
diff --git a/apache2/sites-available/git.conf b/apache2/sites-available/git.conf
index 03f1dd95..8174ffa3 100644
--- a/apache2/sites-available/git.conf
+++ b/apache2/sites-available/git.conf
@@ -1,6 +1,6 @@
 <IfModule mod_ssl.c>
 	<VirtualHost *:443>
-		ServerName git.moellein.homeip.net
+		ServerName git.moellein.homeip.net:443
 		ServerAlias git.moellein.homeip.net
 		DocumentRoot /var/www/gitweb/
 		ScriptAlias /gitweb.cgi /usr/lib/cgi-bin/gitweb.cgi
@@ -10,7 +10,7 @@
 	        Alias /static/git-logo.png /usr/share/gitweb/static/git-logo.png
 		<Directory /var/www/gitweb/>
 			AuthUserFile /etc/apache2/.htpasswd
-			AuthName EnterPassword
+			AuthName "Enter Password for git"
 			AuthType Basic
 			require user git
 			Options +ExecCGI +FollowSymLinks +SymLinksIfOwnerMatch
diff --git a/apache2/sites-available/wiki.ssl.conf b/apache2/sites-available/wiki.ssl.conf
index 8754bc44..58a52c18 100644
--- a/apache2/sites-available/wiki.ssl.conf
+++ b/apache2/sites-available/wiki.ssl.conf
@@ -2,7 +2,7 @@
 	<VirtualHost *:443>
 		ServerAdmin webmaster@localhost
 		DocumentRoot /var/www/wiki/
-		ServerName moellein.homeip.net
+		ServerName wiki.moellein.homeip.net:443
 		ServerAlias wiki.moellein.homeip.net
 		<Directory />
 			Options FollowSymLinks
diff --git a/hosts b/hosts
index 08a84c76..71fdae9c 100644
--- a/hosts
+++ b/hosts
@@ -1,4 +1,4 @@
-127.0.0.1	localhost moellein.homeip.net
+127.0.0.1	localhost moellein.homeip.net collabora.moellein.homeip.net nextcloud.moellein.homeip.net
 127.0.1.1	moellein.homeip.net raspberrypi homeserver wiki wiki.moellein.homeip.net
 
 # The following lines are desirable for IPv6 capable hosts
diff --git a/loolwsd/ca-chain.cert.pem b/loolwsd/ca-chain.cert.pem
new file mode 120000
index 00000000..5326410e
--- /dev/null
+++ b/loolwsd/ca-chain.cert.pem
@@ -0,0 +1 @@
+/etc/letsencrypt/live/moellein.homeip.net/fullchain.pem
\ No newline at end of file
diff --git a/loolwsd/cert.pem b/loolwsd/cert.pem
new file mode 120000
index 00000000..9c3c7b58
--- /dev/null
+++ b/loolwsd/cert.pem
@@ -0,0 +1 @@
+/etc/letsencrypt/live/moellein.homeip.net/cert.pem
\ No newline at end of file
diff --git a/loolwsd/key.pem b/loolwsd/key.pem
new file mode 120000
index 00000000..3918aa10
--- /dev/null
+++ b/loolwsd/key.pem
@@ -0,0 +1 @@
+/etc/letsencrypt/live/moellein.homeip.net/privkey.pem
\ No newline at end of file
diff --git a/loolwsd/loolwsd.xml b/loolwsd/loolwsd.xml
index 28b5f089..1d4e8a27 100644
--- a/loolwsd/loolwsd.xml
+++ b/loolwsd/loolwsd.xml
@@ -1,132 +1,115 @@
 <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>
-
+	<!-- 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 on this instance.">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
+	<tile_cache_path default="/var/cache/loolwsd" desc="Path to a directory where to keep the tile cache." relative="false" type="path"/>
+	<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"/>
+	<lo_template_path default="/opt/collaboraoffice5.3" 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." relative="false" 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"/>
+	<server_name default="" desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." type="string"/>
+	<file_server_root_path default="loleaflet/../" desc="Path to the directory that should be considered root for the file server. This should be the directory containing loleaflet." relative="true" type="path"/>
+	<memproportion default="80.0" desc="The maximum percentage of system memory consumed by all of the LibreOffice Online, 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>
+		<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 -->
+		<idlesave_duration_secs default="30" desc="The number of idle seconds after which document, if modified, should be saved. Defaults to 30 seconds." type="uint">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="uint">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 default="60" 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">60</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>
+	<loleaflet_html default="loleaflet.html" desc="Allows UI customization by replacing the single endpoint of loleaflet.html" type="string">loleaflet.html</loleaflet_html>
+	<logging>
+		<color type="bool">true</color>
+		<level default="warn" desc="Can be 0-8, or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" type="string">warn</level>
+		<file enable="false">
+			<property desc="Log file path." name="path">/var/log/loolwsd.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">false</property>
+		</file>
+		<anonymize>
+			<filenames default="false" desc="Enable to anonymize/obfuscate filenames in logs. If default is true, it was forced at compile-time and cannot be disabled." type="bool">false</filenames>
+			<usernames default="false" desc="Enable to anonymize/obfuscate usernames in logs. If default is true, it was forced at compile-time and cannot be disabled." type="bool">false</usernames>
+		</anonymize>
+	</logging>
+	<loleaflet_logging default="false" desc="Logging in the browser console">true</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 compress="true" desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/looltrace-%.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">
+		<proto default="all" desc="Protocol to use IPv4, IPv6 or all for both" type="string">IPv4</proto>
+		<listen default="any" desc="Listen address that loolwsd binds to. Can be 'any' or 'loopback'." type="string">any</listen>
+		<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>
+		</post_allow>
+	</net>
+	<ssl desc="SSL settings">
+		<enable default="true" type="bool">true</enable>
+		<termination default="true" desc="Connection via proxy where loolwsd 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/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 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>
+	</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>
+	</security>
+	<storage desc="Backend storage">
+		<filesystem allow="true"/>
+		<wopi allow="true" desc="Allow/deny wopi storage. Mutually exclusive with webdav.">
+			<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.">nextcloud\.moellein\.homeip\.net</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>
+			<max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
+		</wopi>
+		<webdav allow="false" desc="Allow/deny webdav storage. Mutually exclusive with wopi.">
+			<host allow="false" desc="Hostname to allow">localhost</host>
+		</webdav>
+	</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 loolconfig to set up a secure password."/>
+		<secure_password desc="Salt and password hash combination generated using PBKDF2 with SHA512 digest.">pbkdf2.sha512.10000.54506d4d97532e8ee4d72f145b1982de106647650ec5e3f6284cc62230aabdf8543789f9a51542be239158f3d489d85cfffe5c635e4752918c9378a6ec0b8fe9f88c31d925670009c1245e0121dca9804038dccb97a25301389a448afc422cff42c02f4f6463cb1185eeb4334b83dab6891f9b6412417effd11a8dbe407578ea.5d7517827580225aa18360aef95830d43361cf7fc87750ad4b7f75c4121ea8d303d3701aa92f521512b12837d7798a5546fa2a0b6ea45811535af1afea0ef6bcac2ca1c8aa0c19a7bc664139e54ad8efccd1f49a37a4984cef226923aa895e162d712ec8ef77736d5f227cb127e0e6f1ecf4d66b64179be21a1a115f882e9b21</secure_password>
+	</admin_console>
+	<monitors desc="Addresses of servers we connect to on start for monitoring"/>
 </config>
diff --git a/rc0.d/K01docker b/rc0.d/K01docker
new file mode 120000
index 00000000..567023b7
--- /dev/null
+++ b/rc0.d/K01docker
@@ -0,0 +1 @@
+../init.d/docker
\ No newline at end of file
diff --git a/rc1.d/K01docker b/rc1.d/K01docker
new file mode 120000
index 00000000..567023b7
--- /dev/null
+++ b/rc1.d/K01docker
@@ -0,0 +1 @@
+../init.d/docker
\ No newline at end of file
diff --git a/rc2.d/K01docker b/rc2.d/K01docker
new file mode 120000
index 00000000..567023b7
--- /dev/null
+++ b/rc2.d/K01docker
@@ -0,0 +1 @@
+../init.d/docker
\ No newline at end of file
diff --git a/rc3.d/K01docker b/rc3.d/K01docker
new file mode 120000
index 00000000..567023b7
--- /dev/null
+++ b/rc3.d/K01docker
@@ -0,0 +1 @@
+../init.d/docker
\ No newline at end of file
diff --git a/rc4.d/K01docker b/rc4.d/K01docker
new file mode 120000
index 00000000..567023b7
--- /dev/null
+++ b/rc4.d/K01docker
@@ -0,0 +1 @@
+../init.d/docker
\ No newline at end of file
diff --git a/rc5.d/K01docker b/rc5.d/K01docker
new file mode 120000
index 00000000..567023b7
--- /dev/null
+++ b/rc5.d/K01docker
@@ -0,0 +1 @@
+../init.d/docker
\ No newline at end of file
diff --git a/rc6.d/K01docker b/rc6.d/K01docker
new file mode 120000
index 00000000..567023b7
--- /dev/null
+++ b/rc6.d/K01docker
@@ -0,0 +1 @@
+../init.d/docker
\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/docker.service b/systemd/system/multi-user.target.wants/docker.service
deleted file mode 120000
index a06e3f51..00000000
--- a/systemd/system/multi-user.target.wants/docker.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/docker.service
\ No newline at end of file