From 6c58403616fa739c9f595027fa0101a1d98b143e Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Sat, 23 Apr 2022 01:20:41 +0200
Subject: [PATCH] fixes to installation and compatibility with 22.04

---
 setup/dovecot-fts-xapian.sh |  4 ++--
 setup/nextcloud.sh          | 10 ++++++----
 setup/system.sh             | 10 ++++------
 setup/webmail.sh            |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/setup/dovecot-fts-xapian.sh b/setup/dovecot-fts-xapian.sh
index 47afda8d..67e553b5 100755
--- a/setup/dovecot-fts-xapian.sh
+++ b/setup/dovecot-fts-xapian.sh
@@ -17,7 +17,7 @@ source /etc/mailinabox.conf # load global vars
 
 echo "Installing fts-xapian..."
 
-apt_install libxapian30
+apt_install dovecot-fts-xapian
 
 # Update the dovecot plugin configuration
 #
@@ -35,7 +35,7 @@ if [ ! -f /usr/lib/dovecot/decode2text.sh ]; then
 	cp -f /usr/share/doc/dovecot-core/examples/decode2text.sh /usr/lib/dovecot
 fi
 
-cp -f lib/lib21_fts_xapian_plugin.so /usr/lib/dovecot/modules/
+#cp -f lib/lib21_fts_xapian_plugin.so /usr/lib/dovecot/modules/
 
 # Create configuration file
 cat > /etc/dovecot/conf.d/90-plugin-fts.conf << EOF;
diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index 676eab9c..8e91977f 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -21,8 +21,8 @@ echo "Installing Nextcloud (contacts/calendar)..."
 #   we automatically install intermediate versions as needed.
 # * The hash is the SHA1 hash of the ZIP package, which you can find by just running this script and
 #   copying it from the error message when it doesn't match what is below.
-nextcloud_ver=23.0.2
-nextcloud_hash=645cba42cab57029ebe29fb93906f58f7abea5f8
+nextcloud_ver=23.0.4
+nextcloud_hash=87afec0bf90b3c66289e6fedd851867bc5a58f01
 
 # Nextcloud apps
 # --------------
@@ -37,7 +37,9 @@ contacts_ver=4.0.8
 contacts_hash=9f368bb2be98c5555b7118648f4cc9fa51e8cb30
 calendar_ver=3.0.6
 calendar_hash=ca49bb1ce23f20e10911e39055fd59d7f7a84c30
-user_external_ver=3.0.0
+#user_external_ver=3.0.0
+#user_external_hash=6e5afe7f36f398f864bfdce9cad72200e70322aa
+user_external_ver=2.1.0
 user_external_hash=6e5afe7f36f398f864bfdce9cad72200e70322aa
 
 # Clear prior packages and install dependencies from apt.
@@ -105,7 +107,7 @@ InstallNextcloud() {
 		rm /tmp/user_external.tgz
 		
 		# (Temporary?) workaround to get user_external working with Nextcloud 23 (see https://github.com/nextcloud/user_external/issues/186)
-		# sed -i "s/nextcloud min-version=\"21\" max-version=\"22\"/nextcloud min-version=\"21\" max-version=\"23\"/g" /usr/local/lib/owncloud/apps/user_external/appinfo/info.xml
+		sed -i "s/nextcloud min-version=\"21\" max-version=\"22\"/nextcloud min-version=\"21\" max-version=\"23\"/g" /usr/local/lib/owncloud/apps/user_external/appinfo/info.xml
 	fi
 
 	# Fix weird permissions.
diff --git a/setup/system.sh b/setup/system.sh
index ef0f4870..4a43e616 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -262,7 +262,7 @@ EOF
 if [ ! -d /etc/systemd/system/apt-daily-upgrade.timer.d ]; then
 	mkdir /etc/systemd/system/apt-daily-upgrade.timer.d
 fi
-cat /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf <<EOF;
+cat > /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf <<EOF;
 [Timer]
 OnCalendar=
 OnCalendar=*-*-* 23:30
@@ -336,17 +336,15 @@ fi #NODOC
 # remove bind9 in case it is still there
 apt-get purge -qq -y bind9 bind9-utils
 
-# Install unbound and dns utils (e.g. dig)
-apt_install unbound python3-unbound bind9-dnsutils
-
 # Configure unbound
 cp -f conf/unbound.conf /etc/unbound/unbound.conf.d/miabunbound.conf
 
-if [ -d /etc/unbound/lists.d ]; then
+if [ ! -d /etc/unbound/lists.d ]; then
 	mkdir /etc/unbound/lists.d
 fi
 
-systemctl restart unbound
+# Install unbound and dns utils (e.g. dig)
+apt_install unbound python3-unbound bind9-dnsutils
 
 unbound-control -q status
 
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 708f8dff..6b19f6b5 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -23,7 +23,7 @@ echo "Installing Roundcube (webmail)..."
 apt_install \
 	dbconfig-common \
 	php-cli php-sqlite3 php-intl php-json php-common php-curl php-ldap \
-	php-gd php-pspell tinymce libjs-jquery libjs-jquery-mousewheel libmagic1 php-mbstring
+	php-gd php-pspell libjs-jquery libjs-jquery-mousewheel libmagic1 php-mbstring
 
 # Install Roundcube from source if it is not already present or if it is out of date.
 # Combine the Roundcube version number with the commit hash of plugins to track