Merge pull request #139 from nextcloud/prepare-20.0.8v20.0.8

Prepare 20.0.8

4 files changed, 15 insertions, 4 deletions

diff --git a/Dockerfile b/Dockerfile
index 81d1e37..5b50dd9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,9 +22,9 @@
 
 FROM ubuntu:20.04
 
-ADD https://download.nextcloud.com/server/releases/nextcloud-20.0.2.tar.bz2 /root/nextcloud.tar.bz2
-ADD https://github.com/nextcloud/richdocuments/releases/download/v3.7.9/richdocuments.tar.gz /root/richdocuments.tar.gz
-ADD https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v6.1.0/onlyoffice.tar.gz /root/onlyoffice.tar.gz
+ADD https://download.nextcloud.com/server/releases/nextcloud-20.0.8.tar.bz2 /root/nextcloud.tar.bz2
+ADD https://github.com/nextcloud/richdocuments/releases/download/v3.7.17/richdocuments.tar.gz /root/richdocuments.tar.gz
+ADD https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v6.3.0/onlyoffice.tar.gz /root/onlyoffice.tar.gz
 COPY resources/entrypoint.sh /usr/sbin/
 COPY resources/60-nextcloud.ini /etc/php/7.4/apache2/conf.d/
 COPY resources/60-nextcloud.ini /etc/php/7.4/cli/conf.d/
@@ -41,6 +41,7 @@ RUN /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" && \
 	cron \
 	curl \
 	libapache2-mod-php \
+	libfuse2 \
 	patch \
 	php \
 	php-bcmath \
diff --git a/Makefile b/Makefile
index 856fd4d..a9d4ef6 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 app_name=nextcloud
-app_version=20.0.2-0
+app_version=20.0.8-0
 app_upgrade_from=19.0.4-0
 
 ucs_version=4.4
diff --git a/resources/60-nextcloud.ini b/resources/60-nextcloud.ini
index 2314210..281c92a 100644
--- a/resources/60-nextcloud.ini
+++ b/resources/60-nextcloud.ini
@@ -6,4 +6,6 @@ opcache.memory_consumption=128
 opcache.save_comments=1
 opcache.revalidate_freq=1
 
+apc.enable_cli=1
+
 memory_limit = 512M
diff --git a/setup b/setup
index 59786bb..95c9e7a 100644
--- a/setup
+++ b/setup
@@ -116,6 +116,7 @@ if [ "$NC_IS_UPGRADE" -eq 0 ] ; then
     $OCC config:system:set updatechecker --type=boolean --value="false"    # this is handled via UCS AppCenter
     $OCC config:system:set upgrade.disable-web --type=boolean --value="true"
     $OCC config:system:set --value "\OC\Memcache\APCu" memcache.local
+    $OCC config:system:set --value "\OC\Memcache\APCu" memcache.distributed
     $OCC config:system:set overwriteprotocol --value="https"
     $OCC config:system:set overwritewbroot --value="/nextcloud"
     $OCC config:system:set overwrite.cli.url --value="https://$NC_UCR_DOMAIN/nextcloud"
@@ -150,6 +151,13 @@ else
     for APPID in "${DISABLED_APPS[@]}" ; do
         $OCC app:enable "$APPID" || $OCC app:install "$APPID" || error_msg "Could not re-enable $APPID"
     done
+
+    MEM_DIST=$($OCC config:system:get --default-value "NOT_SET" memcache.distributed)
+    if [ "${MEM_DIST}" = "NOT_SET" ]; then
+      # some code might require a set distributed memcache
+      # this block is safe to remove with Nextcloud 22
+      $OCC config:system:set --value "\OC\Memcache\APCu" memcache.distributed
+    fi
 fi
 
 # Recreate the htaccess on both install and update