From c1f8886981fedc7be52610568fab346ce9a05f71 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 26 Sep 2019 20:08:56 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -apache2 2.4.29-1ubuntu4.11 amd64 -apache2-bin 2.4.29-1ubuntu4.11 amd64 -apache2-data 2.4.29-1ubuntu4.11 all -apache2-utils 2.4.29-1ubuntu4.11 amd64 +apache2 2.4.41-1+ubuntu18.04.1+deb.sury.org+5 amd64 +apache2-bin 2.4.41-1+ubuntu18.04.1+deb.sury.org+5 amd64 +apache2-data 2.4.41-1+ubuntu18.04.1+deb.sury.org+5 all +apache2-utils 2.4.41-1+ubuntu18.04.1+deb.sury.org+5 amd64 +collaboraoffice6.0 6.0.10.29-20190912 amd64 +collaboraoffice6.0-ure 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-calc 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-core 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-draw 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-en-us 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-extension-pdf-import 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-graphicfilter 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-images 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-impress 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-ooofonts 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-ooolinguistic 6.0.10.29-20190912 amd64 +collaboraofficebasis6.0-writer 6.0.10.29-20190912 amd64 +expat 2.2.5-3ubuntu0.2 amd64 +libbrotli1 1.0.7-2+ubuntu18.04.1+deb.sury.org+1 amd64 -libgl1-mesa-dri 18.0.5-0ubuntu0~18.04.1 amd64 +libgl1-mesa-dri 19.0.8-0ubuntu0~18.04.2 amd64 +libjansson4 2.11-1 amd64 +libllvm8 1:8-3~ubuntu18.04.1 amd64 -linux-generic 4.15.0.38.40 amd64 +linux-generic 4.15.0.64.66 amd64 -linux-headers-generic 4.15.0.38.40 amd64 +linux-headers-4.15.0-64 4.15.0-64.73 all +linux-headers-4.15.0-64-generic 4.15.0-64.73 amd64 +linux-headers-generic 4.15.0.64.66 amd64 -linux-image-generic 4.15.0.38.40 amd64 +linux-image-4.15.0-64-generic 4.15.0-64.73 amd64 +linux-image-generic 4.15.0.64.66 amd64 +linux-modules-4.15.0-64-generic 4.15.0-64.73 amd64 +linux-modules-extra-4.15.0-64-generic 4.15.0-64.73 amd64 +locales-all 2.27-3ubuntu1 amd64 -loolwsd 3.4.2-1 amd64 +loolwsd 4.0.7-1 amd64 -netplan.io 0.36.3 amd64 +netplan.io 0.97-0ubuntu1~18.04.1 amd64 +python3-netifaces 0.10.4-0.1build4 amd64 --- .etckeeper | 6 ++- apache2/mods-available/brotli.load | 1 + apache2/mods-available/http2.conf | 34 ++++++++++++++++ apache2/mods-available/md.load | 1 + apache2/mods-available/proxy_uwsgi.load | 2 + apt/apt.conf.d/01autoremove-kernels | 54 +++++++++++++++---------- apt/apt.conf.d/25loolwsd | 2 +- loolwsd/loolkitconfig.xcu | 9 +++++ 8 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 apache2/mods-available/brotli.load create mode 100644 apache2/mods-available/http2.conf create mode 100644 apache2/mods-available/md.load create mode 100644 apache2/mods-available/proxy_uwsgi.load diff --git a/.etckeeper b/.etckeeper index e4108e3df..a9574df1f 100755 --- a/.etckeeper +++ b/.etckeeper @@ -56,7 +56,6 @@ mkdir -p './systemd/network' mkdir -p './systemd/user' mkdir -p './udev/hwdb.d' mkdir -p './udev/rules.d' -mkdir -p './ufw/applications.d/apache2' mkdir -p './update-manager/release-upgrades.d' maybe chmod 0755 '.' maybe chmod 0700 '.etckeeper' @@ -328,6 +327,7 @@ maybe chmod 0644 'apache2/mods-available/authz_owner.load' maybe chmod 0644 'apache2/mods-available/authz_user.load' maybe chmod 0644 'apache2/mods-available/autoindex.conf' maybe chmod 0644 'apache2/mods-available/autoindex.load' +maybe chmod 0644 'apache2/mods-available/brotli.load' maybe chmod 0644 'apache2/mods-available/buffer.load' maybe chmod 0644 'apache2/mods-available/cache.load' maybe chmod 0644 'apache2/mods-available/cache_disk.conf' @@ -359,6 +359,7 @@ maybe chmod 0644 'apache2/mods-available/filter.load' maybe chmod 0644 'apache2/mods-available/headers.load' maybe chmod 0644 'apache2/mods-available/heartbeat.load' maybe chmod 0644 'apache2/mods-available/heartmonitor.load' +maybe chmod 0644 'apache2/mods-available/http2.conf' maybe chmod 0644 'apache2/mods-available/http2.load' maybe chmod 0644 'apache2/mods-available/ident.load' maybe chmod 0644 'apache2/mods-available/imagemap.load' @@ -375,6 +376,7 @@ maybe chmod 0644 'apache2/mods-available/log_debug.load' maybe chmod 0644 'apache2/mods-available/log_forensic.load' maybe chmod 0644 'apache2/mods-available/lua.load' maybe chmod 0644 'apache2/mods-available/macro.load' +maybe chmod 0644 'apache2/mods-available/md.load' maybe chmod 0644 'apache2/mods-available/mime.conf' maybe chmod 0644 'apache2/mods-available/mime.load' maybe chmod 0644 'apache2/mods-available/mime_magic.conf' @@ -406,6 +408,7 @@ maybe chmod 0644 'apache2/mods-available/proxy_html.load' maybe chmod 0644 'apache2/mods-available/proxy_http.load' maybe chmod 0644 'apache2/mods-available/proxy_http2.load' maybe chmod 0644 'apache2/mods-available/proxy_scgi.load' +maybe chmod 0644 'apache2/mods-available/proxy_uwsgi.load' maybe chmod 0644 'apache2/mods-available/proxy_wstunnel.load' maybe chmod 0644 'apache2/mods-available/ratelimit.load' maybe chmod 0644 'apache2/mods-available/reflector.load' @@ -3588,7 +3591,6 @@ maybe chmod 0640 'ufw/after.init' maybe chmod 0640 'ufw/after.rules' maybe chmod 0640 'ufw/after6.rules' maybe chmod 0755 'ufw/applications.d' -maybe chmod 0755 'ufw/applications.d/apache2' maybe chmod 0644 'ufw/applications.d/apache2-utils.ufw.profile' maybe chmod 0644 'ufw/applications.d/bind9' maybe chmod 0644 'ufw/applications.d/dovecot-imapd' diff --git a/apache2/mods-available/brotli.load b/apache2/mods-available/brotli.load new file mode 100644 index 000000000..ebd48ed1c --- /dev/null +++ b/apache2/mods-available/brotli.load @@ -0,0 +1 @@ +LoadModule brotli_module /usr/lib/apache2/modules/mod_brotli.so diff --git a/apache2/mods-available/http2.conf b/apache2/mods-available/http2.conf new file mode 100644 index 000000000..f45db4d4d --- /dev/null +++ b/apache2/mods-available/http2.conf @@ -0,0 +1,34 @@ + +# mod_http2 doesn't work with mpm_prefork + + Protocols h2 h2c http/1.1 + + # # HTTP/2 push configuration + # + # H2Push on + # + # # Default Priority Rule + # + # H2PushPriority * After 16 + # + # # More complex ruleset: + # + # H2PushPriority * after + # H2PushPriority text/css before + # H2PushPriority image/jpeg after 32 + # H2PushPriority image/png after 32 + # H2PushPriority application/javascript interleaved + # + # # Configure some stylesheet and script to be pushed by the webserver + # + # + # Header add Link "; rel=preload; as=style" + # Header add Link "; rel=preload; as=script" + # + # Since mod_http2 doesn't support the mod_logio module (which provide the %O format), + # you may want to change your LogFormat directive as follow: + # + # LogFormat "%v:%p %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined + # LogFormat "%h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined + # LogFormat "%h %l %u %t \"%r\" %>s %B" common + diff --git a/apache2/mods-available/md.load b/apache2/mods-available/md.load new file mode 100644 index 000000000..812a6a6c3 --- /dev/null +++ b/apache2/mods-available/md.load @@ -0,0 +1 @@ +LoadModule md_module /usr/lib/apache2/modules/mod_md.so diff --git a/apache2/mods-available/proxy_uwsgi.load b/apache2/mods-available/proxy_uwsgi.load new file mode 100644 index 000000000..79ebd428d --- /dev/null +++ b/apache2/mods-available/proxy_uwsgi.load @@ -0,0 +1,2 @@ +# Depends: proxy +LoadModule proxy_uwsgi_module /usr/lib/apache2/modules/mod_proxy_uwsgi.so diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 662a13675..49eac2cb5 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -1,52 +1,62 @@ // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal APT::NeverAutoRemove { - "^linux-image-4\.15\.0-20-generic$"; "^linux-image-4\.15\.0-38-generic$"; - "^linux-headers-4\.15\.0-20-generic$"; + "^linux-image-4\.15\.0-64-generic$"; "^linux-headers-4\.15\.0-38-generic$"; - "^linux-image-extra-4\.15\.0-20-generic$"; + "^linux-headers-4\.15\.0-64-generic$"; "^linux-image-extra-4\.15\.0-38-generic$"; - "^linux-modules-4\.15\.0-20-generic$"; + "^linux-image-extra-4\.15\.0-64-generic$"; "^linux-modules-4\.15\.0-38-generic$"; - "^linux-modules-extra-4\.15\.0-20-generic$"; + "^linux-modules-4\.15\.0-64-generic$"; "^linux-modules-extra-4\.15\.0-38-generic$"; - "^linux-signed-image-4\.15\.0-20-generic$"; + "^linux-modules-extra-4\.15\.0-64-generic$"; "^linux-signed-image-4\.15\.0-38-generic$"; - "^kfreebsd-image-4\.15\.0-20-generic$"; + "^linux-signed-image-4\.15\.0-64-generic$"; + "^linux-image-unsigned-4\.15\.0-38-generic$"; + "^linux-image-unsigned-4\.15\.0-64-generic$"; "^kfreebsd-image-4\.15\.0-38-generic$"; - "^kfreebsd-headers-4\.15\.0-20-generic$"; + "^kfreebsd-image-4\.15\.0-64-generic$"; "^kfreebsd-headers-4\.15\.0-38-generic$"; - "^gnumach-image-4\.15\.0-20-generic$"; + "^kfreebsd-headers-4\.15\.0-64-generic$"; "^gnumach-image-4\.15\.0-38-generic$"; - "^.*-modules-4\.15\.0-20-generic$"; + "^gnumach-image-4\.15\.0-64-generic$"; "^.*-modules-4\.15\.0-38-generic$"; - "^.*-kernel-4\.15\.0-20-generic$"; + "^.*-modules-4\.15\.0-64-generic$"; "^.*-kernel-4\.15\.0-38-generic$"; - "^linux-backports-modules-.*-4\.15\.0-20-generic$"; + "^.*-kernel-4\.15\.0-64-generic$"; "^linux-backports-modules-.*-4\.15\.0-38-generic$"; - "^linux-modules-.*-4\.15\.0-20-generic$"; + "^linux-backports-modules-.*-4\.15\.0-64-generic$"; "^linux-modules-.*-4\.15\.0-38-generic$"; - "^linux-tools-4\.15\.0-20-generic$"; + "^linux-modules-.*-4\.15\.0-64-generic$"; "^linux-tools-4\.15\.0-38-generic$"; - "^linux-cloud-tools-4\.15\.0-20-generic$"; + "^linux-tools-4\.15\.0-64-generic$"; "^linux-cloud-tools-4\.15\.0-38-generic$"; + "^linux-cloud-tools-4\.15\.0-64-generic$"; + "^linux-buildinfo-4\.15\.0-38-generic$"; + "^linux-buildinfo-4\.15\.0-64-generic$"; + "^linux-source-4\.15\.0-38-generic$"; + "^linux-source-4\.15\.0-64-generic$"; }; /* Debug information: # dpkg list: -iF linux-image-4.15.0-38-generic 4.15.0-38.41 amd64 Signed kernel image generic -ii linux-image-generic 4.15.0.38.40 amd64 Generic Linux kernel image +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 # list of installed kernel packages: 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-64.73 4.15.0-38.41 -# Installing kernel: 4.15.0-38.41 (4.15.0-38-generic) -# Running kernel: ignored (4.15.0-20-generic) -# Last kernel: 4.15.0-38.41 -# Previous kernel: +# 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 # Kernel versions list to keep: 4.15.0-38.41 +4.15.0-64.73 # Kernel packages (version part) to protect: -4\.15\.0-20-generic 4\.15\.0-38-generic +4\.15\.0-64-generic */ diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd index f61f969e8..599cede92 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/collaboraoffice5.3 >/dev/null 2>&1'"; }; +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'"; }; diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu index a80508aaf..bbe1942d9 100644 --- a/loolwsd/loolkitconfig.xcu +++ b/loolwsd/loolkitconfig.xcu @@ -4,6 +4,12 @@ false + +11 + + +https://help.collaboraoffice.com/help.html? + true @@ -13,4 +19,7 @@ file:///tmp + +true + -- 2.43.0