Merge 6242f4b43c into c3667633ad

6 years ago · 00e58f7ef3
parent c3667633ad 6242f4b43c
commit 00e58f7ef3
3 changed files with 3 additions and 3 deletions
--- a/ipsec/env.sh
+++ b/ipsec/env.sh
@ -44,7 +44,7 @@ LOCALMASK="/24"
 LOCALIPMASK="$LOCALIP$LOCALMASK"
-IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
+IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '(127|10|100|172|192)\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
 if [[ "$IP" = "" ]]; then
 	IP=$(wget -4qO- "http://whatismyip.akamai.com/")
 fi
--- a/openvpn/env.sh
+++ b/openvpn/env.sh
@ -42,7 +42,7 @@ LOCALMASK="/24"
 LOCALIPMASK="$LOCALIP$LOCALMASK"
-IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
+IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '(127|10|100|172|192)\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
 if [[ "$IP" = "" ]]; then
 	IP=$(wget -4qO- "http://whatismyip.akamai.com/")
 fi
--- a/pptp/env.sh
+++ b/pptp/env.sh
@ -37,7 +37,7 @@ LOCALMASK="/24"
 LOCALIPMASK="$LOCALIP$LOCALMASK"
-IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
+IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '(127|10|100|172|192)\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
 if [[ "$IP" = "" ]]; then
 	IP=$(wget -4qO- "http://whatismyip.akamai.com/")
 fi