From c00e1e98271859cde6d21667125dafe57d4cc030 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Wed, 4 Oct 2017 14:37:53 +0200 Subject: nc-forward-ports: exit status on failure --- changelog.md | 14 +++++++++++--- etc/nextcloudpi-config.d/nc-forward-ports.sh | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/changelog.md b/changelog.md index 68ce35d1..282740f1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,15 @@ -[v0.31.5](https://github.com/nextcloud/nextcloudpi/commit/7bca99d) (2017-09-30) nc-format-USB: fix format disks >2TB and more +[v0.31.10](https://github.com/nextcloud/nextcloudpi/commit/771e967) (2017-10-04) nc-forward-ports: exit status on failure -[v0.31.4](https://github.com/nextcloud/nextcloudpi/commit/cdf1822) (2017-09-30) nc-format-USB: speed up ext4 creation with lazy initialization +[v0.31.9 ](https://github.com/nextcloud/nextcloudpi/commit/89f1cc4) (2017-10-03) nc-wifi: improve instructions + +[v0.31.8 ](https://github.com/nextcloud/nextcloudpi/commit/03f39b2) (2017-09-30) ncp-web: small fixes + +[v0.31.6](https://github.com/nextcloud/nextcloudpi/commit/7a95cc1) (2017-10-03) letsencrypt: fix external bug (Closes #230) + +[v0.31.5 ](https://github.com/nextcloud/nextcloudpi/commit/1195316) (2017-09-30) nc-format-USB: fix format disks >2TB and more (Closes #223) + +[v0.31.4 ](https://github.com/nextcloud/nextcloudpi/commit/cdf1822) (2017-09-30) nc-format-USB: speed up ext4 creation with lazy initialization [v0.31.3 ](https://github.com/nextcloud/nextcloudpi/commit/c2abfaa) (2017-09-30) letsencrypt: fix uppercase domains cert path (Closes #229) @@ -9,7 +17,7 @@ [v0.31.1 ](https://github.com/nextcloud/nextcloudpi/commit/789850c) (2017-09-28) nc-static-IP: fix occ path -[v0.31.0](https://github.com/nextcloud/nextcloudpi/commit/a9f90b9) (2017-09-27) wizard: connect backend with frontend. Modifications for first release +[v0.31.0 ](https://github.com/nextcloud/nextcloudpi/commit/a9f90b9) (2017-09-27) wizard: connect backend with frontend. Modifications for first release [v0.30.0 ](https://github.com/nextcloud/nextcloudpi/commit/87319a2) (2017-09-25) reviewed duckDNS: small adaptations diff --git a/etc/nextcloudpi-config.d/nc-forward-ports.sh b/etc/nextcloudpi-config.d/nc-forward-ports.sh index 55172654..a60f292a 100644 --- a/etc/nextcloudpi-config.d/nc-forward-ports.sh +++ b/etc/nextcloudpi-config.d/nc-forward-ports.sh @@ -37,8 +37,8 @@ configure() local IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(\.\d{1,3}){3}' | head -1 ) upnpc -d "$HTTPSPORT_" TCP upnpc -d "$HTTPPORT_" TCP - upnpc -a "$IP" 443 "$HTTPSPORT_" TCP - upnpc -a "$IP" 80 "$HTTPPORT_" TCP + upnpc -a "$IP" 443 "$HTTPSPORT_" TCP | tee >(cat - >&2) | grep -q "is redirected to internal" || return 1 + upnpc -a "$IP" 80 "$HTTPPORT_" TCP | tee >(cat - >&2) | grep -q "is redirected to internal" || return 1 } # License -- cgit v1.2.3