From b08e45f179530727fcae7c1633ecf68b885cbda9 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Fri, 11 May 2018 13:58:35 +0200
Subject: nc-nextcloud: fix upload tmp dir

---
 etc/ncp-config.d/nc-datadir.sh   | 1 +
 etc/ncp-config.d/nc-nextcloud.sh | 8 ++++++++
 nextcloudplus.sh                 | 7 -------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/etc/ncp-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh
index 63e96c25..1f59d29a 100644
--- a/etc/ncp-config.d/nc-datadir.sh
+++ b/etc/ncp-config.d/nc-datadir.sh
@@ -83,6 +83,7 @@ configure()
   mkdir -p "$DATADIR_/tmp" 
   chown www-data:www-data "$DATADIR_/tmp"
   sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR_/tmp|" /etc/php/7.0/fpm/php.ini
+  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $DATADIR_/tmp|"     /etc/php/7.0/fpm/php.ini
 
   # opcache dir
   sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$DATADIR_/.opcache|" /etc/php/7.0/mods-available/opcache.ini
diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
index 9db038a9..7c9c8398 100644
--- a/etc/ncp-config.d/nc-nextcloud.sh
+++ b/etc/ncp-config.d/nc-nextcloud.sh
@@ -243,6 +243,14 @@ EOF
   sed -i "s/upload_max_filesize=.*/upload_max_filesize=$MAXFILESIZE_/" /var/www/nextcloud/.user.ini 
   sed -i "s/memory_limit=.*/memory_limit=$MEMORYLIMIT_/"               /var/www/nextcloud/.user.ini 
 
+  # TMP UPLOAD DIR
+  local UPLOADTMPDIR=/var/www/nextcloud/data/tmp
+  mkdir -p "$UPLOADTMPDIR"
+  chown www-data:www-data "$UPLOADTMPDIR"
+  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/7.0/fpm/php.ini
+  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $UPLOADTMPDIR|"     /etc/php/7.0/fpm/php.ini
+
+
   # slow transfers will be killed after this time
   cat >> /var/www/nextcloud/.user.ini <<< "max_execution_time=$MAXTRANSFERTIME_"
   cat >> /var/www/nextcloud/.user.ini <<< "max_input_time=$MAXTRANSFERTIME_"
diff --git a/nextcloudplus.sh b/nextcloudplus.sh
index 278d337a..157f3b47 100644
--- a/nextcloudplus.sh
+++ b/nextcloudplus.sh
@@ -19,7 +19,6 @@ WEBPASSWD=ownyourbits
 BRANCH=master
 
 CONFDIR=/usr/local/etc/ncp-config.d/
-UPLOADTMPDIR=/var/www/nextcloud/data/tmp
 APTINSTALL="apt-get install -y --no-install-recommends"
 export DEBIAN_FRONTEND=noninteractive
 
@@ -181,12 +180,6 @@ EOF
   chown root:www-data /var/run/.ncp-latest-version
   chmod g+w           /var/run/.ncp-latest-version
 
-  # TMP UPLOAD DIR
-  mkdir -p "$UPLOADTMPDIR"
-  chown www-data:www-data "$UPLOADTMPDIR"
-  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/7.0/fpm/php.ini
-  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $UPLOADTMPDIR|"     /etc/php/7.0/fpm/php.ini
-
   # update to latest version from github as part of the build process
   $APTINSTALL git
   wget https://raw.githubusercontent.com/nextcloud/nextcloudpi/$BRANCH/bin/ncp-update -O /usr/local/bin/ncp-update
-- 
cgit v1.2.3