upstream v4.0.1-1

5 files changed, 93 insertions, 178 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a63cc2b0993..22a8da53ce5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = collabora-online-server-nodocker
 	pkgdesc = Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker
-	pkgver = 4.0.0
+	pkgver = 4.0.1
 	pkgrel = 1
 	url = https://www.collaboraoffice.com/code/
 	install = install
@@ -19,109 +19,73 @@ pkgbase = collabora-online-server-nodocker
 	makedepends = tar
 	makedepends = util-linux
 	makedepends = xz
-	depends = cpio
-	depends = noto-fonts
-	depends = poco
 	depends = gcc-libs
 	depends = libcap
 	depends = pam
 	depends = libpng12
-	depends = zlib
+	depends = poco
 	depends = openssl-1.0
-	depends = fontconfig
+	depends = zlib
 	depends = libsm
 	depends = libxinerama
 	depends = libxrender
 	depends = mesa-libgl
 	depends = libcups
 	depends = libxcb
-	optdepends = hunspell-de: German hunspell dictionaries for LibreOffice
-	optdepends = hunspell-en: English (US, UK, etc.) hunspell dictionaries for LibreOffice
-	optdepends = hunspell-en_AU: AU English hunspell dictionaries for LibreOffice
-	optdepends = hunspell-en_CA: CA English hunspell dictionaries for LibreOffice
-	optdepends = hunspell-en_GB: GB English hunspell dictionaries for LibreOffice
-	optdepends = hunspell-en_US: US English hunspell dictionaries for LibreOffice
-	optdepends = hunspell-es: Spanish hunspell dictionaries for LibreOffice
-	optdepends = hunspell-fr: French (modern) hunspell dictionaries for LibreOffice
-	optdepends = hunspell-he: Hebrew hunspell dictionary for LibreOffice
-	optdepends = hunspell-it: Italian dictionary for Hunspell for LibreOffice
-	optdepends = hunspell-ro: Romanian dictionary for Hunspell for LibreOffice
-	optdepends = hunspell-el: Greek hunspell dictionary for LibreOffice
-	optdepends = hunspell-hu: Hungarian hunspell dictionary for LibreOffice
-	optdepends = hunspell-nl: Dutch hunspell dictionaries for LibreOffice
-	optdepends = hunspell-pl: Polish dictionary for Hunspell for LibreOffice
-	optdepends = hyphen-de: German hyphenation rules for LibreOffice
-	optdepends = hyphen-en: English hyphenation rules for LibreOffice
-	optdepends = hyphen-es: Spanish hyphenation rules for LibreOffice
-	optdepends = hyphen-fr: French hyphenation rules for LibreOffice
-	optdepends = hyphen-it: Italian hyphenation rules for LibreOffice
-	optdepends = hyphen-nl: Dutch hyphenation rules for LibreOffice
-	optdepends = hyphen-ro: Romanian hyphenation rules for LibreOffice
-	optdepends = hyphen-hu: Hungarian hyphenation rules for LibreOffice
-	optdepends = hyphen-pl: Polish hyphenation rules for LibreOffice
+	depends = glibc
+	depends = expat
+	depends = fontconfig
+	depends = cpio
 	provides = libreoffice
 	provides = libreoffice-en-US
 	backup = opt/collaboraoffice6.0/share/psprint/psprint.conf
+	backup = etc/apache2/conf-available/loolwsd.conf
 	backup = etc/loolwsd/loolkitconfig.xcu
 	backup = etc/loolwsd/loolwsd.xml
+	backup = etc/nginx/snippets/loolwsd.conf
+	backup = etc/sysconfig/loolwsd
 	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/Packages
 	source = install
 	source = mkcert_example.sh
-	source = nginx.conf
 	source = sysusers
 	source = tmpfiles
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_4.0.0-4_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpococrypto60_1.9.0-1_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpocofoundation60_1.9.0-1_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpocojson60_1.9.0-1_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpoconet60_1.9.0-1_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpoconetssl60_1.9.0-1_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpocoutil60_1.9.0-1_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpocoxml60_1.9.0-1_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-calc_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-core_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0-ure_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-graphicfilter_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-images_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-impress_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooofonts_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-writer_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-en-us_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-draw_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-extension-pdf-import_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooolinguistic_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0-dict-en_6.0.10.18-18_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_4.0-1_all.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_4.0.1-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-calc_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-core_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0-ure_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-graphicfilter_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-images_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-impress_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooofonts_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-writer_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-en-us_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-draw_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-extension-pdf-import_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooolinguistic_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0-dict-en_6.0.10.25-25_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_4.0-2_all.deb
 	sha1sums = SKIP
-	sha1sums = e2fe8ff373261782d93c500bcfb87de1350d225a
-	sha1sums = 68ac242ad285eeeca07cb486c22dfbf3a658fe81
-	sha1sums = fe998836dbbd5c153de77d4ea877f25719dae304
+	sha1sums = 3b7c52a40becb96ed9698e624a23cadfe1250a73
+	sha1sums = 132642655c8684a434ad2a43f1661020218cdfde
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
-	sha1sums = f5d8a32868626bd0ecfc1f802c40e561fdc405db
-	sha1sums = db6802765a9b375d2dc9fb608b7b3a4330b3e3b2
-	sha1sums = ea8fd569bcf2de1e76a09ae6815d8d9d487bda02
-	sha1sums = 255b30039316a5aca69dda37802c77addd0c53be
-	sha1sums = 1ba0f47996fbf8debb2d0cc8ece6d84d663725ed
-	sha1sums = 0bca129a6d9b123cc38927b80c99a4f7417c4eea
-	sha1sums = ade47f887c83ebff13dccc661fcbd700629ba50f
-	sha1sums = a19808dc78a3977a4f4173eee238890ab8d1c684
-	sha1sums = 2608f7e60c592308627fa0e3e1ea7f7064672433
-	sha1sums = efa428964e0ca49308b8af89d5692842f9612edb
-	sha1sums = eb2cac057590c4aad2c318f93c80b7a149b07fe2
-	sha1sums = 5230b63a7db3174a4b3a31faed2cd32c67d82c11
-	sha1sums = 7f9f40b700f34add9af19b18cc40fe7be61a86de
-	sha1sums = 05870aff37ccd1827011c69184504dc066afd821
-	sha1sums = 96438311fb50ef416e6f801185cde28efe5c1bee
-	sha1sums = ef1feb6b9d7236acd58a27b640fcfce06451f44d
-	sha1sums = 9b39c79618321e53a8b7173d5444027b5dcc05f4
-	sha1sums = a34d545d74e6a8bf7b1eafc2fd7cfc493f4acdee
-	sha1sums = 916e2f28c40f678bd54804c27ac7099c49c9f628
-	sha1sums = d12992e94e1cebe32839331f2f7c05df12d9efa9
-	sha1sums = 6fa1afa9882e50de51ad2a986b62dc0142c0c884
-	sha1sums = a65a1c513d3bc2870b2192a8d151eca6e4770ca3
-	sha1sums = c79bc2410320d515515ad2c381e31aaea0de106b
+	sha1sums = 34550fd9dc8b15756ea7cb17e612e474845e82c4
+	sha1sums = aa63143135a1e3a1be9dcd85380cb23c5dc48d2d
+	sha1sums = 3110aee06163febfffb90f0278fd6d884227252b
+	sha1sums = 7587d34f170d25e73371ac2665947969bdbd3135
+	sha1sums = 708b71a2eaf49669d2db4c08133969783f130e27
+	sha1sums = afe996cc811b9d4fddb6208094e7d6367fdef723
+	sha1sums = 6222e4d6140e8133b9051a88c5440c774a9d2fea
+	sha1sums = da7a1b06d8335c4cb21810aa700d787073d3f9ec
+	sha1sums = f73bd18f01ef1c05998e0ea0beaad30ee9b05f2c
+	sha1sums = 326cbe71fa7df83b3806b7b175d80d245cb95797
+	sha1sums = 7d053a8a968109def93e48aa1adc213b7ef6c1b3
+	sha1sums = 5b557af4b4bc2da41a7750f04e9e61f287ed6937
+	sha1sums = b7510739ff18f590bff1de6cc12a67f04a93d61a
+	sha1sums = 3a65e8e7315e7f19145aa3961b5a4dcc3f8cebde
+	sha1sums = 8caac839c6c892ac5e2ea7bb8824cfc5c0f1ccde
+	sha1sums = c3ccb514a5693c437ec79817f0730f955ecb5d0b
 
 pkgname = collabora-online-server-nodocker
 
diff --git a/PKGBUILD b/PKGBUILD
index fe6b03fa1e3f..4b011b283745 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Yves G. <theYinYeti@yalis.fr>
 
 pkgname=collabora-online-server-nodocker
-pkgver=4.0.0
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker"
 arch=('x86_64')
@@ -10,47 +10,20 @@ license=('MPL')
 provides=('libreoffice' 'libreoffice-en-US')
 makedepends=(bzip2 coreutils curl fontconfig gawk grep gzip libcap sed systemd tar util-linux xz)
 
-# From official Archlinux’ LibreOffice:
-optdepends=(
-  'hunspell-de: German hunspell dictionaries for LibreOffice'
-  'hunspell-en: English (US, UK, etc.) hunspell dictionaries for LibreOffice'
-  'hunspell-en_AU: AU English hunspell dictionaries for LibreOffice'
-  'hunspell-en_CA: CA English hunspell dictionaries for LibreOffice'
-  'hunspell-en_GB: GB English hunspell dictionaries for LibreOffice'
-  'hunspell-en_US: US English hunspell dictionaries for LibreOffice'
-  'hunspell-es: Spanish hunspell dictionaries for LibreOffice'
-  'hunspell-fr: French (modern) hunspell dictionaries for LibreOffice'
-  'hunspell-he: Hebrew hunspell dictionary for LibreOffice'
-  'hunspell-it: Italian dictionary for Hunspell for LibreOffice'
-  'hunspell-ro: Romanian dictionary for Hunspell for LibreOffice'
-  'hunspell-el: Greek hunspell dictionary for LibreOffice'
-  'hunspell-hu: Hungarian hunspell dictionary for LibreOffice'
-  'hunspell-nl: Dutch hunspell dictionaries for LibreOffice'
-  'hunspell-pl: Polish dictionary for Hunspell for LibreOffice'
-  'hyphen-de: German hyphenation rules for LibreOffice'
-  'hyphen-en: English hyphenation rules for LibreOffice'
-  'hyphen-es: Spanish hyphenation rules for LibreOffice'
-  'hyphen-fr: French hyphenation rules for LibreOffice'
-  'hyphen-it: Italian hyphenation rules for LibreOffice'
-  'hyphen-nl: Dutch hyphenation rules for LibreOffice'
-  'hyphen-ro: Romanian hyphenation rules for LibreOffice'
-  'hyphen-hu: Hungarian hyphenation rules for LibreOffice'
-  'hyphen-pl: Polish hyphenation rules for LibreOffice'
-)
-depends=(cpio noto-fonts poco)
+# From Dockerfile’s install script, minus inotify-tools+psmisc: not actually part of CODE
+depends=()
+
 source=(
   'https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/Packages'
   install
   mkcert_example.sh
-  nginx.conf
   sysusers
   tmpfiles
 )
 sha1sums=(
   'SKIP'
-  'e2fe8ff373261782d93c500bcfb87de1350d225a'
-  '68ac242ad285eeeca07cb486c22dfbf3a658fe81'
-  'fe998836dbbd5c153de77d4ea877f25719dae304'
+  '3b7c52a40becb96ed9698e624a23cadfe1250a73'
+  '132642655c8684a434ad2a43f1661020218cdfde'
   '2d271f9493ea14c675af1bfa76f6b654569dd51f'
   'f9c102a06b2582548f13121e78790237e2cb38e1'
 )
@@ -58,8 +31,12 @@ sha1sums=(
 # From deb’s conffiles
 backup=(
   opt/collaboraoffice6.0/share/psprint/psprint.conf
+  etc/apache2/conf-available/loolwsd.conf
   etc/loolwsd/loolkitconfig.xcu
   etc/loolwsd/loolwsd.xml
+  etc/nginx/snippets/loolwsd.conf
+
+  etc/sysconfig/loolwsd
 )
 
 # From deb’s pre/post scripts
@@ -88,7 +65,8 @@ _upstream_deps='loolwsd code-brand'
 #    thus add the missing dependency in the $depends array.
 _upstream_equiv='
   adduser             = 
-  cpio                = 
+  cpio                = cpio
+  expat               = expat
   fontconfig          = fontconfig
   init-system-helpers = 
   libc6               = gcc-libs
@@ -101,6 +79,13 @@ _upstream_equiv='
   libpam0g            = pam
   libpcre3            = 
   libpng12-0          = libpng12
+  libpococrypto60     = poco
+  libpocofoundation60 = poco
+  libpocojson60       = poco
+  libpoconet60        = poco
+  libpoconetssl60     = poco
+  libpocoutil60       = poco
+  libpocoxml60        = poco
   libsm6              = libsm
   libssl1.0.0         = openssl-1.0
   libstdc++6          = gcc-libs
@@ -108,6 +93,7 @@ _upstream_equiv='
   libxcb-shm0         = libxcb
   libxinerama1        = libxinerama
   libxrender1         = libxrender
+  locales-all         = glibc
   zlib1g              = zlib
 '
 _upstream_equiv_OLD='
@@ -147,7 +133,7 @@ _upstream_handle_dep() {
   fi
 }
 
-if [ ${#source[*]} -eq 6 ]; then
+if [ ${#source[*]} -eq 5 ]; then
   curl -s "${source[0]}" >Packages
   pkgver=$(
     awk -F$'\n' -vRS= '/^Package:[[:blank:]]*loolwsd\n/{print}' Packages \
@@ -177,9 +163,6 @@ package() {
   # /lib is deprecated
   mv {lib,usr/lib}
 
-  # replace the embedded poco, which depends on unknown libpcre.so.3, with Arch poco
-  rm -f usr/lib/libPoco*
-
   # use systemd for user allocation
   install -Dm0644 "$srcdir"/sysusers usr/lib/sysusers.d/$pkgname.conf
 
@@ -188,8 +171,6 @@ package() {
   install -Dm0644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/$pkgname.conf
 
   # add dependency on systemd
-  mv usr/lib{/lib,}/systemd
-  rmdir usr/lib/lib
   sed -i '/^\[Unit\]/ a \
 After=systemd-tmpfiles-setup.service' usr/lib/systemd/system/loolwsd.service
 
@@ -200,22 +181,30 @@ After=systemd-tmpfiles-setup.service' usr/lib/systemd/system/loolwsd.service
   mkdir -p usr/share/applications
   sed -i 's#^Exec=collaboraoffice6.0#Exec=/opt/collaboraoffice6.0/program/soffice#' \
     opt/collaboraoffice6.0/share/xdg/*
-  ls opt/collaboraoffice6.0/share/xdg \
+  ls -1 opt/collaboraoffice6.0/share/xdg \
   | while read f; do
     case "$f" in
-    calc.desktop|draw.desktop|impress.desktop|writer.desktop)
-      sed -i "s#^Icon=.*#Icon=/opt/collaboraoffice6.0/share/config/wizard/web/images/${f%.desktop}.gif#" \
-        opt/collaboraoffice6.0/share/xdg/$f
-      ;;
+    base.desktop)
+      icon=/usr/share/loolwsd/loleaflet/dist/images/lc_basicshapes.can.svg ;;
+    calc.desktop)
+      icon=/usr/share/loolwsd/loleaflet/dist/images/x-office-spreadsheet.svg ;;
+    draw.desktop)
+      icon=/usr/share/loolwsd/loleaflet/dist/images/lc_gallery.svg ;;
+    impress.desktop)
+      icon=/usr/share/loolwsd/loleaflet/dist/images/x-office-presentation.svg ;;
+    math.desktop)
+      icon=/usr/share/loolwsd/loleaflet/dist/images/lc_symbolshapes.brace-pair.svg ;;
+    writer.desktop)
+      icon=/usr/share/loolwsd/loleaflet/dist/images/x-office-document.svg ;;
     *)
-      sed -i 's#^Icon=.*#Icon=/opt/collaboraoffice6.0/share/config/wizard/web/images/other.gif#' \
-        opt/collaboraoffice6.0/share/xdg/$f
-      ;;
+      icon=/usr/share/loolwsd/loleaflet/dist/images/toolbar-bg.svg ;;
     esac
+    sed -i "s#^Icon=.*#Icon=${icon}#" opt/collaboraoffice6.0/share/xdg/"$f"
     mv opt/collaboraoffice6.0/share/xdg/"$f" usr/share/applications/"collaboraoffice-$f"
   done
   rm -rf opt/collaboraoffice6.0/share/xdg
 
-  # give some hints about usage
-  install -Dm0644 "$srcdir"/nginx.conf usr/share/doc/loolwsd/example.nginx.conf
+  # https://github.com/CollaboraOnline/Docker-CODE/issues/32
+  [ -d etc/sysconfig ] || mkdir etc/sysconfig
+  echo 'SLEEPFORDEBUGGER=0' >>etc/sysconfig/loolwsd
 }
diff --git a/install b/install
index d407e72369fc..c77075b7d68f 100644
--- a/install
+++ b/install
@@ -5,18 +5,17 @@ post_install() {
   ## From Debian packages ##
 
   # We assume that the LibreOffice to be used is built TDF-style
-  # and installs in /opt/collaboraoffice5.3, and that /opt/lool is
+  # and installs in /opt/collaboraoffice6.0, and that /opt/lool is
   # on the same file system
-  mkdir -p           opt/lool/child-roots
+  mkdir -p opt/lool/child-roots
 
   ## From Docker script ##
 
-  # Fix lool resolv.conf problem (wizdude)
-  [ -d opt/lool/systemplate/etc ] || mkdir -p opt/lool/systemplate/etc
-  rm -f opt/lool/systemplate/etc/resolv.conf
-  ln -s /etc/resolv.conf opt/lool/systemplate/etc/
+  # Fix domain name resolution from jails
+  : # no need
 
   # Generate new SSL certificate instead of using the default
+  #+
   # Replace trusted host and set admin username and password
   cat <<-THEEND
 IMPORTANT!
@@ -52,8 +51,8 @@ post_upgrade() {
 
   chown -R lool:lool opt/lool
 
-  fc-cache opt/collaboraoffice5.3/share/fonts/truetype
-  su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.3 >/dev/null 2>&1"
+  fc-cache opt/collaboraoffice6.0/share/fonts/truetype
+  su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.0 >/dev/null 2>&1'
 
   systemctl daemon-reload
   if systemctl list-unit-files loolwsd.service | grep -q 'enabled$'; then
diff --git a/mkcert_example.sh b/mkcert_example.sh
index 09f85e821d07..7aa3d200a343 100644
--- a/mkcert_example.sh
+++ b/mkcert_example.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 ## Taken from the Dockerfile script
+# With fix:
+#-if test "${cert_domain-set}" == set; then
+#+if test "${cert_domain:-set}" == set; then
 
 mkdir -p /opt/ssl/
 cd /opt/ssl/
diff --git a/nginx.conf b/nginx.conf
deleted file mode 100644
index aae64cd96654..000000000000
--- a/nginx.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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;
-}
-
-location ^~ /lool {
-  # this parent location makes sure that a global PHP catch-all
-  # won’t pre-empt the first two child locations below
-
-  # 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;
-  }
-}