From 2ab49f4c1ff3e0dbe3ef5110e0cf9ee87cf56682 Mon Sep 17 00:00:00 2001 From: Ignacio Nunez Date: Mon, 14 May 2018 20:41:49 +0200 Subject: [PATCH] nc-datadir: fix php cli tmpdir --- changelog.md | 14 ++++++++++---- etc/ncp-config.d/nc-datadir.sh | 1 + etc/ncp-config.d/nc-nextcloud.sh | 1 + etc/ncp-config.d/nc-restore.sh | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index f0e50fc5e..b5a1e5f92 100644 --- a/changelog.md +++ b/changelog.md @@ -1,11 +1,17 @@ -[v0.55.0](https://github.com/nextcloud/nextcloudpi/commit/e270979) (2018-05-11) added nc-update-nextcloud +[v0.55.2](https://github.com/nextcloud/nextcloudpi/commit/9109d3a) (2018-05-14) nc-datadir: fix php cli tmpdir -[v0.54.13](https://github.com/nextcloud/nextcloudpi/commit/057f531) (2018-05-11) nc-nextcloud: fix upload tmp dir +[v0.55.1](https://github.com/nextcloud/nextcloudpi/commit/a0a1145) (2018-05-14) nc-backup: exclude ncp-update-nc backups -[v0.54.12](https://github.com/nextcloud/nextcloudpi/commit/d8fc729) (2018-05-11) nc-restore: fix tmp dirs in backups without data +[v0.55.0 ](https://github.com/nextcloud/nextcloudpi/commit/935cf30) (2018-05-11) added nc-update-nextcloud -[v0.54.11](https://github.com/nextcloud/nextcloudpi/commit/784c99e) (2018-05-11) nc-backup: make more robust to unexpected failure +[v0.54.14](https://github.com/nextcloud/nextcloudpi/commit/adf38df) (2018-05-14) samba: fix permissions + +[v0.54.13](https://github.com/nextcloud/nextcloudpi/commit/570479d) (2018-05-11) nc-nextcloud: fix upload tmp dir + +[v0.54.12](https://github.com/nextcloud/nextcloudpi/commit/03e9682) (2018-05-11) nc-restore: fix tmp dirs in backups without data + +[v0.54.11](https://github.com/nextcloud/nextcloudpi/commit/98d34a4) (2018-05-11) nc-backup: make more robust to unexpected failure [v0.54.10](https://github.com/nextcloud/nextcloudpi/commit/41b35c8) (2018-05-11) nc-restore: make more robust to unexpected failure diff --git a/etc/ncp-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh index 1f59d29aa..bd98ef8d0 100644 --- a/etc/ncp-config.d/nc-datadir.sh +++ b/etc/ncp-config.d/nc-datadir.sh @@ -82,6 +82,7 @@ configure() # tmp upload dir 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/cli/php.ini 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 diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh index fc75b6e98..b4c0121b0 100644 --- a/etc/ncp-config.d/nc-nextcloud.sh +++ b/etc/ncp-config.d/nc-nextcloud.sh @@ -246,6 +246,7 @@ EOF 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/cli/php.ini 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 diff --git a/etc/ncp-config.d/nc-restore.sh b/etc/ncp-config.d/nc-restore.sh index 4ccf81820..b4f99a1af 100644 --- a/etc/ncp-config.d/nc-restore.sh +++ b/etc/ncp-config.d/nc-restore.sh @@ -147,6 +147,7 @@ sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$DATADIR/.opcache|" /etc/php # tmp upload dir 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/cli/php.ini 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