]> git.hoellein.online Git - vserver/commitdiff
projects / vserver / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1a4667b)
committing changes in /etc after apt run
authormhoellein <mario@hoellein.online>
Tue, 7 Jul 2020 08:30:20 +0000 (10:30 +0200)
committermhoellein <mario@hoellein.online>
Tue, 7 Jul 2020 08:30:20 +0000 (10:30 +0200)
Package changes:
-certbot 0.23.0-1 all
+certbot 0.27.0-1~ubuntu18.04.1 all
+collaboraoffice6.2 6.2.10.18-18 amd64
+collaboraoffice6.2-ure 6.2.10.18-18 amd64
+collaboraofficebasis6.2-calc 6.2.10.18-18 amd64
+collaboraofficebasis6.2-core 6.2.10.18-18 amd64
+collaboraofficebasis6.2-draw 6.2.10.18-18 amd64
+collaboraofficebasis6.2-en-us 6.2.10.18-18 amd64
+collaboraofficebasis6.2-extension-pdf-import 6.2.10.18-18 amd64
+collaboraofficebasis6.2-graphicfilter 6.2.10.18-18 amd64
+collaboraofficebasis6.2-images 6.2.10.18-18 amd64
+collaboraofficebasis6.2-impress 6.2.10.18-18 amd64
+collaboraofficebasis6.2-ooofonts 6.2.10.18-18 amd64
+collaboraofficebasis6.2-ooolinguistic 6.2.10.18-18 amd64
+collaboraofficebasis6.2-writer 6.2.10.18-18 amd64
-libgl1-mesa-dri 19.0.8-0ubuntu0~18.04.2 amd64
+libgl1-mesa-dri 19.2.8-0ubuntu0~18.04.3 amd64
+libllvm9 1:9-2~ubuntu18.04.2 amd64
+libnetplan0 0.99-0ubuntu3~18.04.3 amd64
-linux-generic 4.15.0.64.66 amd64
+linux-generic 4.15.0.109.97 amd64
+linux-headers-4.15.0-109 4.15.0-109.110 all
+linux-headers-4.15.0-109-generic 4.15.0-109.110 amd64
-linux-headers-generic 4.15.0.64.66 amd64
+linux-headers-generic 4.15.0.109.97 amd64
+linux-image-4.15.0-109-generic 4.15.0-109.110 amd64
-linux-image-generic 4.15.0.64.66 amd64
+linux-image-generic 4.15.0.109.97 amd64
+linux-modules-4.15.0-109-generic 4.15.0-109.110 amd64
+linux-modules-extra-4.15.0-109-generic 4.15.0-109.110 amd64
-loolwsd 4.0.7-1 amd64
+loolwsd 4.2.5-4 amd64
-netplan.io 0.98-0ubuntu1~18.04.1 amd64
+netplan.io 0.99-0ubuntu3~18.04.3 amd64
-python3-acme 0.22.2-1ubuntu0.1 all
+python3-acme 0.31.0-2~ubuntu18.04.1 all
-python3-certbot 0.23.0-1 all
+python3-certbot 0.27.0-1~ubuntu18.04.1 all
+python3-requests-toolbelt 0.8.0-1 all

.etckeeper patch | blob | history
apt/apt.conf.d/01autoremove-kernels patch | blob | history
apt/apt.conf.d/25loolwsd patch | blob | history
cron.d/loolwsd patch | blob | history
loolwsd/loolkitconfig.xcu patch | blob | history
loolwsd/proof_key [new file with mode: 0644] patch | blob
loolwsd/proof_key.pub [new file with mode: 0644] patch | blob

diff --git a/.etckeeper b/.etckeeper
index ce6f31dd76e84c210887871ce1aa1f396795e280..b47d1218b5a32b8c9ed023b77c1a67f408260148 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -5634,6 +5634,10 @@ 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/proof_key'
+maybe chgrp 'lool' 'loolwsd/proof_key'
+maybe chmod 0600 'loolwsd/proof_key'
+maybe chmod 0644 'loolwsd/proof_key.pub'
 maybe chmod 0644 'lsb-release'
 maybe chmod 0644 'ltrace.conf'
 maybe chmod 0444 'machine-id'
diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 49eac2cb5e6f265bd3953ab72af8aff31769f362..8cbac721e1cfa5b133c8c22423339f7cea8dd7d1 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,62 +1,65 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
 APT::NeverAutoRemove
 {
-   "^linux-image-4\.15\.0-38-generic$";
+   "^linux-image-4\.15\.0-109-generic$";
    "^linux-image-4\.15\.0-64-generic$";
-   "^linux-headers-4\.15\.0-38-generic$";
+   "^linux-headers-4\.15\.0-109-generic$";
    "^linux-headers-4\.15\.0-64-generic$";
-   "^linux-image-extra-4\.15\.0-38-generic$";
+   "^linux-image-extra-4\.15\.0-109-generic$";
    "^linux-image-extra-4\.15\.0-64-generic$";
-   "^linux-modules-4\.15\.0-38-generic$";
+   "^linux-modules-4\.15\.0-109-generic$";
    "^linux-modules-4\.15\.0-64-generic$";
-   "^linux-modules-extra-4\.15\.0-38-generic$";
+   "^linux-modules-extra-4\.15\.0-109-generic$";
    "^linux-modules-extra-4\.15\.0-64-generic$";
-   "^linux-signed-image-4\.15\.0-38-generic$";
+   "^linux-signed-image-4\.15\.0-109-generic$";
    "^linux-signed-image-4\.15\.0-64-generic$";
-   "^linux-image-unsigned-4\.15\.0-38-generic$";
+   "^linux-image-unsigned-4\.15\.0-109-generic$";
    "^linux-image-unsigned-4\.15\.0-64-generic$";
-   "^kfreebsd-image-4\.15\.0-38-generic$";
+   "^kfreebsd-image-4\.15\.0-109-generic$";
    "^kfreebsd-image-4\.15\.0-64-generic$";
-   "^kfreebsd-headers-4\.15\.0-38-generic$";
+   "^kfreebsd-headers-4\.15\.0-109-generic$";
    "^kfreebsd-headers-4\.15\.0-64-generic$";
-   "^gnumach-image-4\.15\.0-38-generic$";
+   "^gnumach-image-4\.15\.0-109-generic$";
    "^gnumach-image-4\.15\.0-64-generic$";
-   "^.*-modules-4\.15\.0-38-generic$";
+   "^.*-modules-4\.15\.0-109-generic$";
    "^.*-modules-4\.15\.0-64-generic$";
-   "^.*-kernel-4\.15\.0-38-generic$";
+   "^.*-kernel-4\.15\.0-109-generic$";
    "^.*-kernel-4\.15\.0-64-generic$";
-   "^linux-backports-modules-.*-4\.15\.0-38-generic$";
+   "^linux-backports-modules-.*-4\.15\.0-109-generic$";
    "^linux-backports-modules-.*-4\.15\.0-64-generic$";
-   "^linux-modules-.*-4\.15\.0-38-generic$";
+   "^linux-modules-.*-4\.15\.0-109-generic$";
    "^linux-modules-.*-4\.15\.0-64-generic$";
-   "^linux-tools-4\.15\.0-38-generic$";
+   "^linux-tools-4\.15\.0-109-generic$";
    "^linux-tools-4\.15\.0-64-generic$";
-   "^linux-cloud-tools-4\.15\.0-38-generic$";
+   "^linux-cloud-tools-4\.15\.0-109-generic$";
    "^linux-cloud-tools-4\.15\.0-64-generic$";
-   "^linux-buildinfo-4\.15\.0-38-generic$";
+   "^linux-buildinfo-4\.15\.0-109-generic$";
    "^linux-buildinfo-4\.15\.0-64-generic$";
-   "^linux-source-4\.15\.0-38-generic$";
+   "^linux-source-4\.15\.0-109-generic$";
    "^linux-source-4\.15\.0-64-generic$";
 };
 /* Debug information:
 # dpkg list:
-ii  linux-image-4.15.0-38-generic                4.15.0-38.41                               amd64        Signed kernel image generic
-iF  linux-image-4.15.0-64-generic                4.15.0-64.73                               amd64        Signed kernel image generic
-ii  linux-image-generic                          4.15.0.64.66                               amd64        Generic Linux kernel image
+iF  linux-image-4.15.0-109-generic               4.15.0-109.110                                  amd64        Signed kernel image generic
+ii  linux-image-4.15.0-38-generic                4.15.0-38.41                                    amd64        Signed kernel image generic
+ii  linux-image-4.15.0-64-generic                4.15.0-64.73                                    amd64        Signed kernel image generic
+ii  linux-image-generic                          4.15.0.109.97                                   amd64        Generic Linux kernel image
 # list of installed kernel packages:
+4.15.0-109-generic 4.15.0-109.110
 4.15.0-38-generic 4.15.0-38.41
 4.15.0-64-generic 4.15.0-64.73
 # list of different kernel versions:
+4.15.0-109.110
 4.15.0-64.73
 4.15.0-38.41
-# Installing kernel: 4.15.0-64.73 (4.15.0-64-generic)
-# Running kernel: 4.15.0-38.41 (4.15.0-38-generic)
-# Last kernel: 4.15.0-64.73
-# Previous kernel: 4.15.0-38.41
+# Installing kernel: 4.15.0-109.110 (4.15.0-109-generic)
+# Running kernel: 4.15.0-64.73 (4.15.0-64-generic)
+# Last kernel: 4.15.0-109.110
+# Previous kernel: 4.15.0-64.73
 # Kernel versions list to keep:
-4.15.0-38.41
+4.15.0-109.110
 4.15.0-64.73
 # Kernel packages (version part) to protect:
-4\.15\.0-38-generic
+4\.15\.0-109-generic
 4\.15\.0-64-generic
 */
diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd
index 599cede924740b94b0df3c0ddec8c3dee46b5e08..c8e80e38b9a3275c815077c30f41320ea52f7cef 100644 (file)
--- a/apt/apt.conf.d/25loolwsd
+++ b/apt/apt.conf.d/25loolwsd
@@ -1,2 +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/collaboraoffice6.0 >/dev/null 2>&1'"; };
+// Rebuild systemplate of Collabora Online Development Edition
+DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.2 >/dev/null 2>&1'"; };
diff --git a/cron.d/loolwsd b/cron.d/loolwsd
index 761029b928328a260f1aeadce846b6788b903a88..d32374141882eb0f579dcb26dec6b574ee957689 100644 (file)
--- a/cron.d/loolwsd
+++ b/cron.d/loolwsd
@@ -1 +1 @@
-0 0 */1 * * root find /var/cache/loolwsd -type f -a -atime +10 -exec rm {} \;
+0 0 */1 * * root find /var/cache/loolwsd -type f -a -atime +10 -delete
diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu
index bbe1942d904914ddff0e1a39be491f9c4c4ac62b..a2a71171144728cdcb40f484224598164a6ce19b 100644 (file)
--- a/loolwsd/loolkitconfig.xcu
+++ b/loolwsd/loolkitconfig.xcu
@@ -7,6 +7,9 @@
 <!-- Dialogs have limited real estate, limit drop-down height -->
 <item oor:path="/org.openoffice.Office.Common/Accessibility"><prop oor:name="ListBoxMaximumLineCount" oor:op="fuse"><value>11</value></prop></item>
 
+<!-- Disable two capitals at start autocorrect -->
+<item oor:path="/org.openoffice.Office.Common/AutoCorrect"><prop oor:name="TwoCapitalsAtStart" oor:op="fuse"><value>false</value></prop></item>
+
 <!-- The Help root URL, or empty for no help (hides the help buttons) -->
 <item oor:path="/org.openoffice.Office.Common/Help"><prop oor:name="HelpRootURL" oor:op="fuse"><value>https://help.collaboraoffice.com/help.html?</value></prop></item>
 
@@ -22,4 +25,13 @@
 <!-- Enable thumbnail generation by default (disabling saves CPU time) -->
 <item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="GenerateThumbnail" oor:op="fuse"><value>true</value></prop></item>
 
+<!-- Use the collabora_svg theme for the sidebar -->
+<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>collabora_svg</value></prop></item>
+
+<!-- Use the large icons in the sidebar -->
+<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SidebarIconSize" oor:op="fuse"><value>2</value></prop></item>
+
+<!-- Disable GIO UCP we don't want -->
+<item oor:path="/org.openoffice.ucb.Configuration/ContentProviders/Local/SecondaryKeys/Office/ProviderData/Provider999"><prop oor:name="URLTemplate" oor:op="fuse"><value>NeverMatchAnyUrlSuffix</value></prop></item>
+
 </oor:items>
diff --git a/loolwsd/proof_key b/loolwsd/proof_key
new file mode 100644 (file)
index 0000000..90303ef
--- /dev/null
+++ b/loolwsd/proof_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA1KHq81vHR31GDh6WZje5tE+xaQbkQQsa7xrUhI2Z75DU4sWC
+hQ0BF6Z6iO9tyqZXS9jY1LVfsME6QEnZUkOx09dtwG68bSqVvW038ziwZKGzyJH2
+5tumE8DUtDDv9ONhat0qYRSyJtfDZJZcqsFzJqth8SjTmN9A/Y5s5l7vjTC5e4oz
+gX0ZxBSO1FaHwoDN6KhTlCDMezXgz5Z/I1z4ngW588DDuv/ODDDlor9j0eWkA6X+
+JXM+YLUbLtS0K8dpvliXy/7PZv1+iXPlHF+cSZ+cQg/LCnHqbi0G2gS7cbTitp4H
++rdd0jofH4jOvbroCEy/2d0aKbPTV/HTTUgJPwIDAQABAoIBAHZf0hI7RPzqpAaW
+RrqPSWY1e5nxyT7gtNTqReepgUpagfnhZSE3NSV6e/sh+Ch6ZF0IUuZQNv6LBCfo
+NQFUSHqcEzCvNV08+PHlDOHt7F2JnDIL+L1bCOE0V/YczGmz8Hbyu3YidG+lbNTh
+1KMHYVjkznjYdrxDhcXi9YNm1MvvkXNBMiTXRaRDXBKUwH5z3ZsJI/TkOYzGW1RK
+mMfPDAej4g9iyh5Q4w/G2n1k5D68ALWhc7gFdL/SUp3eW+/m4dut65ZPNWResONF
+XLXBD2z6rXFXPTiHTVdnCFDgLGQo7YiLIGK2SwtCCyHwo/+A8w0PApqzjIKG4WYZ
+UU3CVzECgYEA7UNSIJYXcZ9k9o0zaNSx1wRJKJjPbtFmn9hTuShvI+KBfM4bujM9
+gb4AVE9FSfQB2CacG02bN8GontZOCl/w1k+gUlZCKgKjgjZEBSSydJ1XH0FH3GtN
+ZK8drq9FmrUUyx+ORIhAn+2TR7QCzj6hh+PwLeg+5WPnCWWGjqrkW2cCgYEA5Wym
+QKOp5Y5B5S4W112JuXEI8ryPbKhiyKB+ikQnwQZtG3cveIn2TzEM6iBPMnn+Ne28
+qL4VsjsccDhFXkn5/076dPXnOYsGvTYIByBPn2dWZjLzp8/a6ZLExi48x2nT09sP
+yPaaNI3B/GP32nrIx3ml0Y0Y7LgGDwhI4IOhlGkCgYAphHo+kYUQsN+t9Q9l7LIh
++fIDVJoXvjTDC8u6vsST9vLJsBdSAd1lcqYEGsr5IeWguUDf1jivDQhAoyeM0TUH
+i292ePmi+Es8YdqNO9quZUn1girc+znTwIDlLG51n/I/iQoQG/eTBLOc/HbxOCxz
+5wMERXucEFtBXa6qEGVdSQKBgQCyDxE5OcyyjSY3aP3xSHeLpV78hbwK6OVCMM4F
+IcB43zPvDSGau/iencMYMttEocnasRirHlxYZ+g6cHHmLCQLMpDQFcnPr0cbssOo
+RDuHy/wSdZkFtRyCC5cM+PXTDx+IXYxyvHISN7NG34+N0Z3is1cuvAOMNYb+Q7/M
+AF13gQKBgG6e8plJewqT9T9754yD6/0xmReCq6oHNyhUCRYDlNzndxBiBPLcU+9x
+wO5PjAk+mIIcdtsDVQzdg2Gu044w+FDJYZTTF5BefOscRYSiGQoEF8rEPz+uhvA1
+q7YVYO2xV5g+OKczLUAoUN6sVmCSFGBTq/XASUUqFT/VQuoqITwp
+-----END RSA PRIVATE KEY-----
diff --git a/loolwsd/proof_key.pub b/loolwsd/proof_key.pub
new file mode 100644 (file)
index 0000000..6b9ed66
--- /dev/null
+++ b/loolwsd/proof_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUoerzW8dHfUYOHpZmN7m0T7FpBuRBCxrvGtSEjZnvkNTixYKFDQEXpnqI723KpldL2NjUtV+wwTpASdlSQ7HT123AbrxtKpW9bTfzOLBkobPIkfbm26YTwNS0MO/042Fq3SphFLIm18NkllyqwXMmq2HxKNOY30D9jmzmXu+NMLl7ijOBfRnEFI7UVofCgM3oqFOUIMx7NeDPln8jXPieBbnzwMO6/84MMOWiv2PR5aQDpf4lcz5gtRsu1LQrx2m+WJfL/s9m/X6Jc+UcX5xJn5xCD8sKcepuLQbaBLtxtOK2ngf6t13SOh8fiM69uugITL/Z3Rops9NX8dNNSAk/ root@mail
etckeeper - vserver