From: mhoellein Date: Tue, 14 Jul 2020 11:25:01 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=0bfa0a33ab291d183e1e2952ccdf70c124e33db4;p=homeserver committing changes in /etc after apt run Package changes: -casper 1.394 amd64 -certbot 0.23.0-1 all +casper 1.394.3 amd64 +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 +finalrd 3~ubuntu18.04.0 all -libgl1-mesa-dri 19.0.8-0ubuntu0~18.04.3 amd64 -libgl1-mesa-dri 19.0.8-0ubuntu0~18.04.3 i386 +libgl1-mesa-dri 20.0.8-0ubuntu1~18.04.1 amd64 +libgl1-mesa-dri 20.0.8-0ubuntu1~18.04.1 i386 +libllvm10 1:10.0.0-4ubuntu1~18.04.1 amd64 +libllvm10 1:10.0.0-4ubuntu1~18.04.1 i386 +libnetplan0 0.99-0ubuntu3~18.04.3 amd64 -libpam-systemd 237-3ubuntu10.29 amd64 +libpam-systemd 237-3ubuntu10.41 amd64 -libsystemd-dev 237-3ubuntu10.29 amd64 +libsystemd-dev 237-3ubuntu10.41 amd64 -libsystemd0 237-3ubuntu10.29 amd64 -libsystemd0 237-3ubuntu10.29 i386 +libsystemd0 237-3ubuntu10.41 amd64 +libsystemd0 237-3ubuntu10.41 i386 -libxatracker2 19.0.8-0ubuntu0~18.04.3 amd64 +libxatracker2 20.0.8-0ubuntu1~18.04.1 amd64 +libzstd1 1.3.3+dfsg-2ubuntu1.1 i386 -loolwsd 4.0.9-4 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 -systemd 237-3ubuntu10.29 amd64 -systemd-coredump 237-3ubuntu10.29 amd64 +systemd 237-3ubuntu10.41 amd64 +systemd-coredump 237-3ubuntu10.41 amd64 --- diff --git a/.etckeeper b/.etckeeper index a3a236f0..fd4a1bcd 100755 --- a/.etckeeper +++ b/.etckeeper @@ -7620,6 +7620,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 0755 'lvm' diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd index 599cede9..c8e80e38 100644 --- 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 761029b9..d3237414 100644 --- 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/dhcp/dhclient-enter-hooks.d/resolved b/dhcp/dhclient-enter-hooks.d/resolved index b504f5b8..ebbb31fb 100755 --- a/dhcp/dhclient-enter-hooks.d/resolved +++ b/dhcp/dhclient-enter-hooks.d/resolved @@ -28,6 +28,9 @@ if [ -x /lib/systemd/systemd-resolved ] ; then fi statedir="/run/systemd/resolved.conf.d" mkdir -p $statedir + + oldstate="$(mktemp)" + md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf > $oldstate 2> /dev/null if [ -n "$new_domain_name_servers" ] ; then cat <$statedir/isc-dhcp-v4-$interface.conf [Resolve] @@ -50,7 +53,15 @@ Domains=$new_dhcp6_domain_search EOF fi fi - systemctl try-reload-or-restart systemd-resolved.service + + newstate="$(mktemp)" + md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf > $newstate 2> /dev/null + if ! cmp $oldstate $newstate; then + systemctl try-reload-or-restart systemd-resolved.service + fi + + rm $oldstate + rm $newstate } ;; diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu index bbe1942d..a2a71171 100644 --- a/loolwsd/loolkitconfig.xcu +++ b/loolwsd/loolkitconfig.xcu @@ -7,6 +7,9 @@ 11 + +false + https://help.collaboraoffice.com/help.html? @@ -22,4 +25,13 @@ true + +collabora_svg + + +2 + + +NeverMatchAnyUrlSuffix + diff --git a/loolwsd/proof_key b/loolwsd/proof_key new file mode 100644 index 00000000..fe2f6590 --- /dev/null +++ b/loolwsd/proof_key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAwTr4h8qFMSg+mn9GpAM/0JHKUktWwr0rgK+npjnuOhQU3cDM +d4Oct/yb2QoURfRgyyCkKiy27qi9ncwFjZHoIRawyShajkvp9V5FoCJXgucnQScM +VbEzV8I2lJSasmcBFWwwfMZxzoaQQ1NDmx1W/anMixDTrsh+jT5KG93cHzBASsjY +V4MZR8FPZdxAgDMeck/JQLiVQZT9wEzGO9Ve0ExqHp5pqmywBCZBfX7x3yJtz1vG +GrVZnoJk7OpvdTaH5E3yfm9dhnF2aw5IRa5wMjZX99AP7cX+G9KrQXJFCSGf2Upk +VPdbJzOgYFcmYzUnw0531A/2VutbSkHO/2ZdCwIDAQABAoIBAQC4cO2h0DHqhhub +pTlsfJ2BHGgevUMHh0HrB7/i7xDx5xEzykBhJAOHq1ung/NuAqIRwgpxJ1VF4VN9 +N61lQIxuaRY+LIKjqNqdF2smOyGFFddmXTts4EO91Of8UwyGlcN3C1oM/+7Jz7AM +U4IIoazTXCyd4WXtQ/toHrjmeJMQQHcoUfukorFqg+sOYPFHpihc4KmBg6NjCtJ9 +HBMwtilXZkR0OBhfUqprwtqDkrxMiJFtQK5Wm4wtuFyBfBEQvVq+C9Sm2sFShStU +L0+xcDYfd3plqoC2lWFP0EvmrPXzdYPM+Qpk5wlLa4kwDMc76hsgIQOY2Oos478P +A6evvhUBAoGBAPh9tW4hU1+tcYa71NNBl8yOS8OVIpU1DQ5EewkeNzRzwVHgCPX4 +2yrO+kNhfsujAYLkgYEGoMFD0poVUy2LsofUBFgDkNKnCOurn5Eva6ulAfsEc9/F +V+XOeCi6nueWw411KU+ba297c5m/mfAARyczj8V8+JFu0MXELwQbgnjhAoGBAMcR +xfSSJ/lS2qNygRXDsRMeRRz81rAn16XazM9yNYIHfWkZSs4rWAYr95GWTp/crOqh +tLABfliS+oaO4DzmXOExihqbrQZGn4kOYyiv4yw0GYawD+W0rIcqsW6kYpgYqmvj +ckqz8UEPRbIEOU+wywqN1EGUo1K+5PVWqB5xFbdrAoGAHMwcuY2dJupnzLB54p2o +ZOlcuGbRIi+KusuO4qigxzBfCAkJoM/dPmHMOQDUe+8BHtUyeOx2ts8QWhD8mbul +zf3xHu4S24bGDuHN1TqEpNizmQ6UCyvImvZJkJbIEZi0QvF//xzI35uT8w50XY76 +r/1WvRFVkS0hfrnUpQo3HaECgYEAiQECbD/qov0S3EqB7KixxaafikO4vaOuFsdv +DZZcnRDqjtqJUTsjaZv41onLstn9Z73CzR86BVuib9kFGuSwJ4wgsA9UFW2lfn4Y +YHgssM9qgffJ+R1PX/dSBgO8l1DieT4f+qm88DnCjbG6f83871aNLlVN0jTu/qqV +Kd5KQ+ECgYEAqWUAd7nJdobnGL5Gzd+vVSC7lXtjoVb+ptp+YhpXHxINELkX0erC +jN/bLZWI1EoLuzNF2+5jdfjv6zMz1RmatFw0gjDXIwAJk4PNb6ipjhjX3BC7rNS1 +R/cverkjdrvYHSnXBly4K+W5n5oCw36PTgE/c1xptjT9sW680GffAi8= +-----END RSA PRIVATE KEY----- diff --git a/loolwsd/proof_key.pub b/loolwsd/proof_key.pub new file mode 100644 index 00000000..6471706e --- /dev/null +++ b/loolwsd/proof_key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBOviHyoUxKD6af0akAz/QkcpSS1bCvSuAr6emOe46FBTdwMx3g5y3/JvZChRF9GDLIKQqLLbuqL2dzAWNkeghFrDJKFqOS+n1XkWgIleC5ydBJwxVsTNXwjaUlJqyZwEVbDB8xnHOhpBDU0ObHVb9qcyLENOuyH6NPkob3dwfMEBKyNhXgxlHwU9l3ECAMx5yT8lAuJVBlP3ATMY71V7QTGoenmmqbLAEJkF9fvHfIm3PW8YatVmegmTs6m91NofkTfJ+b12GcXZrDkhFrnAyNlf30A/txf4b0qtBckUJIZ/ZSmRU91snM6BgVyZjNSfDTnfUD/ZW61tKQc7/Zl0L root@homeserver diff --git a/systemd/system/sysinit.target.wants/finalrd.service b/systemd/system/sysinit.target.wants/finalrd.service new file mode 120000 index 00000000..f87ac61a --- /dev/null +++ b/systemd/system/sysinit.target.wants/finalrd.service @@ -0,0 +1 @@ +/lib/systemd/system/finalrd.service \ No newline at end of file