diff options
| author | nachoparker <nacho@ownyourbits.com> | 2017-09-01 11:16:45 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2017-09-02 00:32:22 +0300 |
| commit | e5790d4a853d52a1087fa5cfa23d75eb78f69067 (patch) | |
| tree | e95c1805e3fafd9b702814f3486efe5990642dbe | |
| parent | a695c1669383d9ab8d02488177c1a6739c8a889c (diff) | |
fix IP regexv0.24.18
| -rwxr-xr-x | docker/run-nc.sh | 2 | ||||
| -rwxr-xr-x | docker/run-ncdocker.sh | 2 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/dnsmasq.sh | 2 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/nc-forward-ports.sh | 2 | ||||
| -rw-r--r-- | nextcloudpi.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/run-nc.sh b/docker/run-nc.sh index 6f3dcd34..58017440 100755 --- a/docker/run-nc.sh +++ b/docker/run-nc.sh @@ -64,7 +64,7 @@ test -e /data/config && { # Trusted Domain ( local IP ) IFACE=$( ip r | grep "default via" | awk '{ print $5 }' ) -IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 ) +IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(\.\d{1,3}){3}' | head -1 ) sudo -u www-data php $OCC config:system:set trusted_domains 2 --value="$IP" echo "Starting Apache" diff --git a/docker/run-ncdocker.sh b/docker/run-ncdocker.sh index d30f07c3..f7cb5def 100755 --- a/docker/run-ncdocker.sh +++ b/docker/run-ncdocker.sh @@ -2,6 +2,6 @@ # Initial Trusted Domain IFACE=$( ip r | grep "default via" | awk '{ print $5 }' ) -IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 ) +IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(\.\d{1,3}){3}' | head -1 ) docker run -d -p 443:443 -p 80:80 -v ncdata:/data --name nextcloudpi ownyourbits/nextcloudpi $IP diff --git a/etc/nextcloudpi-config.d/dnsmasq.sh b/etc/nextcloudpi-config.d/dnsmasq.sh index ed1d358b..5688b5c0 100644 --- a/etc/nextcloudpi-config.d/dnsmasq.sh +++ b/etc/nextcloudpi-config.d/dnsmasq.sh @@ -40,7 +40,7 @@ configure() [[ $ACTIVE_ != "yes" ]] && { service dnsmasq stop; update-rc.d dnsmasq disable; return; } local IFACE=$( ip r | grep "default via" | awk '{ print $5 }' ) - local IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 ) + local IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(\.\d{1,3}){3}' | head -1 ) [[ "$IP" == "" ]] && { echo "could not detect IP"; return 1; } diff --git a/etc/nextcloudpi-config.d/nc-forward-ports.sh b/etc/nextcloudpi-config.d/nc-forward-ports.sh index f8342a1f..5f1fdfc6 100644 --- a/etc/nextcloudpi-config.d/nc-forward-ports.sh +++ b/etc/nextcloudpi-config.d/nc-forward-ports.sh @@ -40,7 +40,7 @@ install() configure() { local IFACE=$( ip r | grep "default via" | awk '{ print $5 }' ) - local IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 ) + 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 diff --git a/nextcloudpi.sh b/nextcloudpi.sh index 36946c19..2c4d6777 100644 --- a/nextcloudpi.sh +++ b/nextcloudpi.sh @@ -106,7 +106,7 @@ EOF cat > /usr/local/bin/nextcloud-domain.sh <<'EOF' #!/bin/bash IFACE=$( ip r | grep "default via" | awk '{ print $5 }' ) -IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 ) +IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(\.\d{1,3}){3}' | head -1 ) # wicd service finishes before completing DHCP while [[ "$IP" == "" ]]; do sleep 3 |