diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-05-22 21:27:11 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-05-22 21:27:21 +0300 |
| commit | 9e8fc92837d662811ce864e76197f26cbdee9670 (patch) | |
| tree | 3c730c96fb0fccc504546847c7efcb13b7d1cb40 | |
| parent | 99d9f4782e54b9a519e85babc54715c8cf066c73 (diff) | |
fix php cli tmpdir for running instancesv0.56.8
| -rw-r--r-- | changelog.md | 6 | ||||
| -rw-r--r-- | etc/ncp-config.d/nc-notify-updates.sh | 2 | ||||
| -rwxr-xr-x | update.sh | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/changelog.md b/changelog.md index fad0561e..140b922b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v0.56.7](https://github.com/nextcloud/nextcloudpi/commit/d508710) (2018-05-22) move NC httpd logs to /var/log +[v0.56.8](https://github.com/nextcloud/nextcloudpi/commit/f047cf7) (2018-05-22) fix php cli tmpdir for running instances -[v0.56.6](https://github.com/nextcloud/nextcloudpi/commit/7afb720) (2018-05-20) fix update httpd log location in virtual host after nc-datadir +[v0.56.7 ](https://github.com/nextcloud/nextcloudpi/commit/54da658) (2018-05-22) move NC httpd logs to /var/log + +[v0.56.6 ](https://github.com/nextcloud/nextcloudpi/commit/7afb720) (2018-05-20) fix update httpd log location in virtual host after nc-datadir [v0.56.5 ](https://github.com/nextcloud/nextcloudpi/commit/d54b243) (2018-05-20) ncp-autoupdate: dont return 0 if no updates available diff --git a/etc/ncp-config.d/nc-notify-updates.sh b/etc/ncp-config.d/nc-notify-updates.sh index b7ea24c8..cc0432da 100644 --- a/etc/ncp-config.d/nc-notify-updates.sh +++ b/etc/ncp-config.d/nc-notify-updates.sh @@ -39,7 +39,7 @@ LATEST=/var/run/.ncp-latest-version NOTIFIED=/var/run/.ncp-version-notified test -e \$LATEST || exit 0; -ncp-test-updates || { echo "NextCloudPlus up to date"; exit 0; } +/usr/local/bin/ncp-test-updates || { echo "NextCloudPlus up to date"; exit 0; } test -e \$NOTIFIED && [[ "\$( cat \$LATEST )" == "\$( cat \$NOTIFIED )" ]] && { echo "Found update from \$( cat \$VERFILE ) to \$( cat \$LATEST ). Already notified" @@ -163,6 +163,10 @@ done sed -i "s|CustomLog.*|CustomLog /var/log/apache2/nc-access.log combined|" /etc/apache2/sites-available/nextcloud.conf sed -i "s|ErrorLog .*|ErrorLog /var/log/apache2/nc-error.log|" /etc/apache2/sites-available/nextcloud.conf + # fix php cli tmpdir for running instances + DATADIR="$( grep datadirectory /var/www/nextcloud/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 )" + sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR|" /etc/php/7.0/cli/php.ini + } # end - only live updates exit 0 |