diff options
author | nachoparker <nacho@ownyourbits.com> | 2018-02-07 11:35:12 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2018-02-07 19:07:56 +0300 |
commit | d7f253e25cb9fc3c8555075d37c1f807fddd2a03 (patch) | |
tree | 9c91368568d8ce6ea638b4daadeacbe9b2b6ecbe | |
parent | c8aa2a2ab527c0adbee48094dc1652ff3e786fb7 (diff) |
ping to 4.2.2.2 because google is blocked in chinav0.46.1
-rwxr-xr-x | bin/ncp-check-version | 2 | ||||
-rwxr-xr-x | bin/ncp-update | 2 | ||||
-rw-r--r-- | changelog.md | 6 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/letsencrypt.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/nc-nextcloud.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/no-ip.sh | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/bin/ncp-check-version b/bin/ncp-check-version index 3a78766f..23335aaf 100755 --- a/bin/ncp-check-version +++ b/bin/ncp-check-version @@ -4,7 +4,7 @@ [ $(id -u) -ne 0 ] && exit 1 -ping -W 2 -w 1 -q google.com &>/dev/null || { echo "No internet connectivity"; exit 1; } +ping -W 2 -w 1 -q 4.2.2.2 &>/dev/null || { echo "No internet connectivity"; exit 1; } rm -rf /tmp/ncp-check-tmp diff --git a/bin/ncp-update b/bin/ncp-update index c9e52559..1195ab4e 100755 --- a/bin/ncp-update +++ b/bin/ncp-update @@ -4,7 +4,7 @@ { [ "$(id -u)" -ne 0 ] && { printf "Must be run as root. Try 'sudo $0'\n"; exit 1; } - ping -W 2 -w 1 -q google.com &>/dev/null || { echo "No internet connectivity"; exit 1; } + ping -W 2 -w 1 -q 4.2.2.2 &>/dev/null || { echo "No internet connectivity"; exit 1; } echo -e "Downloading updates" rm -rf /tmp/ncp-update-tmp git clone --depth 20 -q https://github.com/nextcloud/nextcloudpi.git /tmp/ncp-update-tmp || exit 1 diff --git a/changelog.md b/changelog.md index d6723b12..27db75b9 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v0.46.0](https://github.com/nextcloud/nextcloudpi/commit/73d181a) (2018-02-06) update to NC 13.0.0 +[v0.46.1](https://github.com/nextcloud/nextcloudpi/commit/94224c9) (2018-02-07) ping to 4.4.4.2 because google is blocked in china -[v0.45.4](https://github.com/nextcloud/nextcloudpi/commit/f09e195) (2018-02-06) added ncp-config link to nextcloudpi-config +[v0.46.0 ](https://github.com/nextcloud/nextcloudpi/commit/4c9dab6) (2018-02-06) update to NC 13.0.0 + +[v0.45.4 ](https://github.com/nextcloud/nextcloudpi/commit/f09e195) (2018-02-06) added ncp-config link to nextcloudpi-config [v0.45.3 ](https://github.com/nextcloud/nextcloudpi/commit/2b178ab) (2018-02-05) lamp: add ldap support (#377) diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/nextcloudpi-config.d/letsencrypt.sh index f1eb3a89..519a4970 100644 --- a/etc/nextcloudpi-config.d/letsencrypt.sh +++ b/etc/nextcloudpi-config.d/letsencrypt.sh @@ -57,7 +57,7 @@ EOF # tested with git version v0.11.0-71-g018a304 configure() { - ping -W 2 -w 1 -q google.com &>/dev/null || { echo "No internet connectivity"; return 1; } + ping -W 2 -w 1 -q 4.2.2.2 &>/dev/null || { echo "No internet connectivity"; return 1; } local DOMAIN_LOWERCASE="${DOMAIN_,,}" diff --git a/etc/nextcloudpi-config.d/nc-nextcloud.sh b/etc/nextcloudpi-config.d/nc-nextcloud.sh index ce0e31b8..687d422e 100644 --- a/etc/nextcloudpi-config.d/nc-nextcloud.sh +++ b/etc/nextcloudpi-config.d/nc-nextcloud.sh @@ -90,7 +90,7 @@ install() configure() { - ping -W 2 -w 1 -q google.com &>/dev/null || { echo "No internet connectivity"; return 1; } + ping -W 2 -w 1 -q 4.2.2.2 &>/dev/null || { echo "No internet connectivity"; return 1; } ## IF BETA SELECTED ADD "pre" to DOWNLOAD PATH [[ "$BETA_" == yes ]] && local PREFIX="pre" diff --git a/etc/nextcloudpi-config.d/no-ip.sh b/etc/nextcloudpi-config.d/no-ip.sh index e0e985a1..2504d772 100644 --- a/etc/nextcloudpi-config.d/no-ip.sh +++ b/etc/nextcloudpi-config.d/no-ip.sh @@ -88,7 +88,7 @@ configure() service noip2 stop [[ $ACTIVE_ != "yes" ]] && { update-rc.d noip2 disable; return 0; } - ping -W 2 -w 1 -q google.com &>/dev/null || { echo "No internet connectivity"; return 1; echo "noip DDNS disabled"; } + ping -W 2 -w 1 -q 4.2.2.2 &>/dev/null || { echo "No internet connectivity"; return 1; echo "noip DDNS disabled"; } local IF=$( ip -br l | awk '{ if ( $2 == "UP" ) print $1 }' | head -1 ) [[ "$IF" != "" ]] && IF="-I $IF" |