From d19a7f7e7f0be844e5560dc91ec426dd7c5f828c Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sat, 1 Dec 2018 14:55:59 -0700
Subject: [PATCH] nc-datadir: also use tempdirectory setting

---
 changelog.md                     |  6 +++++-
 etc/ncp-config.d/nc-datadir.sh   |  1 +
 etc/ncp-config.d/nc-init.sh      | 10 ++++++++++
 etc/ncp-config.d/nc-nextcloud.sh |  9 ---------
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/changelog.md b/changelog.md
index d784cd35a..174307834 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 
-[v0.67.3](https://github.com/nextcloud/nextcloudpi/commit/d3c72cc) (2018-11-26) nc-datadir: shorten short description
+[v0.67.5](https://github.com/nextcloud/nextcloudpi/commit/5ef27fb) (2018-12-01) nc-datadir: also use tempdirectory setting
+
+[v0.67.4 ](https://github.com/nextcloud/nextcloudpi/commit/88d9fe2) (2018-11-26) nc-restore: check that we are in linux fs
+
+[v0.67.3 ](https://github.com/nextcloud/nextcloudpi/commit/5278bfd) (2018-11-26) nc-datadir: shorten short description
 
 [v0.67.2 ](https://github.com/nextcloud/nextcloudpi/commit/5e4be44) (2018-11-26) change dialog text width to 120
 
diff --git a/etc/ncp-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh
index 9e056789d..62be26ee1 100644
--- a/etc/ncp-config.d/nc-datadir.sh
+++ b/etc/ncp-config.d/nc-datadir.sh
@@ -95,6 +95,7 @@ configure()
   # tmp upload dir
   mkdir -p "$DATADIR_/tmp" 
   chown www-data:www-data "$DATADIR_/tmp"
+  sudo -u www-data php occ config:system:set tempdirectory "$DATADIR_/tmp"
   sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR_/tmp|" /etc/php/${PHPVER}/cli/php.ini
   sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR_/tmp|" /etc/php/${PHPVER}/fpm/php.ini
   sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $DATADIR_/tmp|"     /etc/php/${PHPVER}/fpm/php.ini
diff --git a/etc/ncp-config.d/nc-init.sh b/etc/ncp-config.d/nc-init.sh
index 8d3528ec1..9996d9a1b 100644
--- a/etc/ncp-config.d/nc-init.sh
+++ b/etc/ncp-config.d/nc-init.sh
@@ -101,6 +101,16 @@ EOF
 );
 EOF
 
+  # tmp upload dir
+  local UPLOADTMPDIR=/var/www/nextcloud/data/tmp
+  mkdir -p "$UPLOADTMPDIR"
+  chown www-data:www-data "$UPLOADTMPDIR"
+  sudo -u www-data php occ config:system:set tempdirectory "$UPLOADTMPDIR"
+  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/${PHPVER}/cli/php.ini
+  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/${PHPVER}/fpm/php.ini
+  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $UPLOADTMPDIR|"     /etc/php/${PHPVER}/fpm/php.ini
+
+
   # 4 Byte UTF8 support
   sudo -u www-data php occ config:system:set mysql.utf8mb4 --type boolean --value="true"
 
diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
index 5ac9540f0..af39bcb7e 100644
--- a/etc/ncp-config.d/nc-nextcloud.sh
+++ b/etc/ncp-config.d/nc-nextcloud.sh
@@ -235,15 +235,6 @@ 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/${PHPVER}/cli/php.ini
-  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/${PHPVER}/fpm/php.ini
-  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $UPLOADTMPDIR|"     /etc/php/${PHPVER}/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_"