Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/nextcloudpi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornachoparker <nacho@ownyourbits.com>2017-11-16 21:51:47 +0300
committernachoparker <nacho@ownyourbits.com>2017-11-16 21:54:33 +0300
commitba765664f7ac9bdda466c39d2253fefafb320d78 (patch)
treed1e21e51f1ff3f5de71133661936b69dd9650499
parent95240caadb25442a56f1134cf01ed7aefac475b2 (diff)
update: check existence ncp.confv0.34.15
-rw-r--r--changelog.md4
-rwxr-xr-xupdate.sh6
2 files changed, 7 insertions, 3 deletions
diff --git a/changelog.md b/changelog.md
index 1fba55a7..469359f7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
-[v0.34.14](https://github.com/nextcloud/nextcloudpi/commit/723d51b) (2017-11-16) update: check return code
+[v0.34.15](https://github.com/nextcloud/nextcloudpi/commit/97febf5) (2017-11-16) update: check existence ncp.conf
+
+[v0.34.14](https://github.com/nextcloud/nextcloudpi/commit/206b6de) (2017-11-16) update: check return code
[v0.34.13](https://github.com/nextcloud/nextcloudpi/commit/29109ba) (2017-11-16) improve IP detection
diff --git a/update.sh b/update.sh
index f7625547..85255249 100755
--- a/update.sh
+++ b/update.sh
@@ -165,8 +165,10 @@ exit $RET
EOF
# 2 days to avoid very big backups requests to timeout
- grep -q TimeOut /etc/apache2/sites-enabled/ncp.conf || \
- sed -i '/SSLCertificateKeyFile/aTimeOut 172800' /etc/apache2/sites-enabled/ncp.conf
+ test -f /etc/apache2/sites-enabled/ncp.conf && {
+ grep -q TimeOut /etc/apache2/sites-enabled/ncp.conf || \
+ sed -i '/SSLCertificateKeyFile/aTimeOut 172800' /etc/apache2/sites-enabled/ncp.conf
+ } || true
# relocate noip2 config
mkdir -p /usr/local/etc/noip2