From: mhoellein Date: Thu, 15 Nov 2018 07:41:18 +0000 (+0100) Subject: committing changes in /etc after apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=c4c1759b14d605d2ad85ab3dd351a1cc68bf53ca;p=homeserver committing changes in /etc after apt run Package changes: -adobe-flashplugin 1:20181009.1-0ubuntu0.18.04.1 amd64 +adobe-flashplugin 1:20181113.1-0ubuntu0.18.04.1 amd64 -amavisd-new 1:2.11.0-1ubuntu1 all +amavisd-new 1:2.11.0-1ubuntu1.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 +collaboraoffice5.3 5.3.10.60-60 amd64 +collaboraoffice5.3-ure 5.3.10.60-60 amd64 +collaboraofficebasis5.3-calc 5.3.10.60-60 amd64 +collaboraofficebasis5.3-core 5.3.10.60-60 amd64 +collaboraofficebasis5.3-draw 5.3.10.60-60 amd64 +collaboraofficebasis5.3-en-us 5.3.10.60-60 amd64 +collaboraofficebasis5.3-en-us-calc 5.3.10.60-60 amd64 +collaboraofficebasis5.3-en-us-res 5.3.10.60-60 amd64 +collaboraofficebasis5.3-extension-pdf-import 5.3.10.60-60 amd64 +collaboraofficebasis5.3-filter-data 5.3.10.60-60 amd64 +collaboraofficebasis5.3-graphicfilter 5.3.10.60-60 amd64 +collaboraofficebasis5.3-images 5.3.10.60-60 amd64 +collaboraofficebasis5.3-impress 5.3.10.60-60 amd64 +collaboraofficebasis5.3-noto-fonts 5.3.10.60-60 amd64 +collaboraofficebasis5.3-ooofonts 5.3.10.60-60 amd64 +collaboraofficebasis5.3-ooolinguistic 5.3.10.60-60 amd64 +collaboraofficebasis5.3-writer 5.3.10.60-60 amd64 -gettext 0.19.8.1-6 amd64 -gettext-base 0.19.8.1-6 amd64 +gettext 0.19.8.1-6ubuntu0.1 amd64 +gettext-base 0.19.8.1-6ubuntu0.1 amd64 -libasprintf-dev 0.19.8.1-6 amd64 -libasprintf0v5 0.19.8.1-6 amd64 +libasprintf-dev 0.19.8.1-6ubuntu0.1 amd64 +libasprintf0v5 0.19.8.1-6ubuntu0.1 amd64 -libgettextpo-dev 0.19.8.1-6 amd64 -libgettextpo0 0.19.8.1-6 amd64 -libgettextpo0 0.19.8.1-6 i386 +libgettextpo-dev 0.19.8.1-6ubuntu0.1 amd64 +libgettextpo0 0.19.8.1-6ubuntu0.1 amd64 +libgettextpo0 0.19.8.1-6ubuntu0.1 i386 -libglib2.0-0 2.56.2-0ubuntu0.18.04.2 amd64 -libglib2.0-0 2.56.2-0ubuntu0.18.04.2 i386 -libglib2.0-bin 2.56.2-0ubuntu0.18.04.2 amd64 +libglib2.0-0 2.56.3-0ubuntu0.18.04.1 amd64 +libglib2.0-0 2.56.3-0ubuntu0.18.04.1 i386 +libglib2.0-bin 2.56.3-0ubuntu0.18.04.1 amd64 -libglib2.0-data 2.56.2-0ubuntu0.18.04.2 all +libglib2.0-data 2.56.3-0ubuntu0.18.04.1 all -libmspack0 0.6-3ubuntu0.1 amd64 +libmspack0 0.6-3ubuntu0.2 amd64 -libpam-systemd 237-3ubuntu10.4 amd64 +libpam-systemd 237-3ubuntu10.6 amd64 -libpq5 10.5-0ubuntu0.18.04 amd64 +libpq5 10.6-0ubuntu0.18.04.1 amd64 -libpython2.7 2.7.15~rc1-1 amd64 -libpython2.7-dev 2.7.15~rc1-1 amd64 -libpython2.7-minimal 2.7.15~rc1-1 amd64 -libpython2.7-stdlib 2.7.15~rc1-1 amd64 +libpython2.7 2.7.15~rc1-1ubuntu0.1 amd64 +libpython2.7-dev 2.7.15~rc1-1ubuntu0.1 amd64 +libpython2.7-minimal 2.7.15~rc1-1ubuntu0.1 amd64 +libpython2.7-stdlib 2.7.15~rc1-1ubuntu0.1 amd64 -libsystemd0 237-3ubuntu10.4 amd64 -libsystemd0 237-3ubuntu10.4 i386 +libsystemd0 237-3ubuntu10.6 amd64 +libsystemd0 237-3ubuntu10.6 i386 -libudev1 237-3ubuntu10.4 amd64 -libudev1 237-3ubuntu10.4 i386 +libudev1 237-3ubuntu10.6 amd64 +libudev1 237-3ubuntu10.6 i386 -linux-libc-dev 4.15.0-38.41 amd64 +linux-libc-dev 4.15.0-39.42 amd64 -loolwsd 3.4.0-8 amd64 +loolwsd 3.4.1-1 amd64 -python2.7 2.7.15~rc1-1 amd64 -python2.7-dev 2.7.15~rc1-1 amd64 -python2.7-minimal 2.7.15~rc1-1 amd64 +python2.7 2.7.15~rc1-1ubuntu0.1 amd64 +python2.7-dev 2.7.15~rc1-1ubuntu0.1 amd64 +python2.7-minimal 2.7.15~rc1-1ubuntu0.1 amd64 -python3-apport 2.20.9-0ubuntu7.4 all +python3-apport 2.20.9-0ubuntu7.5 all -python3-problem-report 2.20.9-0ubuntu7.4 all +python3-problem-report 2.20.9-0ubuntu7.5 all -systemd 237-3ubuntu10.4 amd64 +systemd 237-3ubuntu10.6 amd64 -systemd-sysv 237-3ubuntu10.4 amd64 +systemd-sysv 237-3ubuntu10.6 amd64 -ubuntu-drivers-common 1:0.5.2.1 amd64 +ubuntu-drivers-common 1:0.5.2.2 amd64 -udev 237-3ubuntu10.4 amd64 +udev 237-3ubuntu10.6 amd64 --- diff --git a/.etckeeper b/.etckeeper index 5c63b563..32e2c86a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -258,6 +258,7 @@ maybe chmod 0644 'apache2/conf-available/gitweb.conf' maybe chmod 0644 'apache2/conf-available/httpd.conf' maybe chmod 0644 'apache2/conf-available/javascript-common.conf' maybe chmod 0644 'apache2/conf-available/localized-error-pages.conf' +maybe chmod 0644 'apache2/conf-available/loolwsd.conf' maybe chmod 0644 'apache2/conf-available/other-vhosts-access-log.conf' maybe chmod 0644 'apache2/conf-available/owncloud.conf' maybe chmod 0644 'apache2/conf-available/php7.2-fpm.conf' @@ -3585,6 +3586,9 @@ maybe chmod 0644 'networks' maybe chmod 0755 'newt' maybe chmod 0644 'newt/palette.original' maybe chmod 0644 'newt/palette.ubuntu' +maybe chmod 0755 'nginx' +maybe chmod 0755 'nginx/snippets' +maybe chmod 0644 'nginx/snippets/loolwsd.conf' maybe chmod 0644 'nsswitch.conf' maybe chmod 0644 'ntp.conf' maybe chmod 0755 'nxagent' diff --git a/apache2/conf-available/loolwsd.conf b/apache2/conf-available/loolwsd.conf new file mode 100644 index 00000000..10b66b47 --- /dev/null +++ b/apache2/conf-available/loolwsd.conf @@ -0,0 +1,31 @@ +# Apache2 reverse proxy configuration for Collabora Online / LibreOffice Online +# Internet <-- SSL --> Reverse Proxy <-- No SSL --> loolwsd +# Make sure that you enable the following Apache2 modules: proxy, proxy_wstunnel, and proxy_http. +# Create a virtual host for Collabora Online / LibreOffice Online and include this configuration file. + + Options -Indexes + + # Encoded slashes need to be allowed + AllowEncodedSlashes NoDecode + + # keep the host + ProxyPreserveHost On + + # static html, js, images, etc. served from loolwsd + # loleaflet is the client part of LibreOffice Online + ProxyPass /loleaflet http://127.0.0.1:9980/loleaflet retry=0 + ProxyPassReverse /loleaflet http://127.0.0.1:9980/loleaflet + + # WOPI discovery URL + ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0 + ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery + + # Main websocket + ProxyPassMatch "/lool/(.*)/ws$" ws://127.0.0.1:9980/lool/$1/ws nocanon + + # Admin Console websocket + ProxyPass /lool/adminws ws://127.0.0.1:9980/lool/adminws + + # Download as, Fullscreen presentation and Image upload operations + ProxyPass /lool http://127.0.0.1:9980/lool + ProxyPassReverse /lool http://127.0.0.1:9980/lool diff --git a/chromium-browser/customizations/10-flash b/chromium-browser/customizations/10-flash index 64fcc28a..f43eb790 100644 --- a/chromium-browser/customizations/10-flash +++ b/chromium-browser/customizations/10-flash @@ -1,6 +1,6 @@ flashso="/usr/lib/adobe-flashplugin/libpepflashplayer.so" if test -f "$flashso"; then - CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ppapi-flash-path=$flashso --ppapi-flash-version=31.0.0.122" + CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ppapi-flash-path=$flashso --ppapi-flash-version=31.0.0.148" echo "Using PPAPI flash." else echo "PPAPI flash has config file in /etc, but library does not exist and won't be used. Package is uninstalled, not purged." diff --git a/nginx/snippets/loolwsd.conf b/nginx/snippets/loolwsd.conf new file mode 100644 index 00000000..f55f8829 --- /dev/null +++ b/nginx/snippets/loolwsd.conf @@ -0,0 +1,35 @@ + # static files + location ^~ /loleaflet { + proxy_pass http://localhost:9980; + proxy_set_header Host $http_host; + } + + # WOPI discovery URL + location ^~ /hosting/discovery { + proxy_pass http://localhost:9980; + proxy_set_header Host $http_host; + } + + # main websocket + location ~ ^/lool/(.*)/ws$ { + proxy_pass http://localhost:9980; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $http_host; + proxy_read_timeout 36000s; + } + + # download, presentation and image upload + location ~ ^/lool { + proxy_pass http://localhost:9980; + proxy_set_header Host $http_host; + } + + # Admin Console websocket + location ^~ /lool/adminws { + proxy_pass http://localhost:9980; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $http_host; + proxy_read_timeout 36000s; + }