Update get IP address method

l2tp.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
-#===============================================================================================
+#===================================================================
 #   SYSTEM REQUIRED:  CentOS 6 (32bit/64bit)
 #   DESCRIPTION:  Auto install L2TP for CentOS 6
 #   Author: Teddysun <[email protected]>
-#===============================================================================================
+#===================================================================
 
-if [[ "$USER" != 'root' ]]; then
-    echo "Sorry, you need to run this as root"
+if [[ $EUID -ne 0 ]]; then
+    echo "Error:This script must be run as root!"
     exit 1
 fi
 
 if [[ ! -e /dev/net/tun ]]; then
-    echo "TUN/TAP is not available"
+    echo "TUN/TAP is not available!"
     exit 1
 fi
 
@@ -27,9 +27,9 @@ echo "# Author: Teddysun <[email protected]>                         #"
 echo "#############################################################"
 echo ""
 
-tmpip=`ifconfig |grep 'inet' | grep -Evi '(inet6|127.0.0.1)' | awk '{print $2}' | cut -d: -f2 | tail -1`
+tmpip=`ip addr | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | egrep -v "^192\.168|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-2]\.|^10\.|^127\.|^255\." | head -n 1`
 if [[ "$tmpip" = "" ]]; then
-    tmpip=$(curl -4 icanhazip.com)
+    tmpip=`curl -s -4 icanhazip.com`
 fi
 
 echo "Please input IP-Range:"

l2tp_ubuntu.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
-#===============================================================================================
+#===================================================================
 #   SYSTEM REQUIRED:  Ubuntu (32bit/64bit)
 #   DESCRIPTION:  Auto install L2TP for Ubuntu
 #   Author: Teddysun <[email protected]>
-#===============================================================================================
+#===================================================================
 
-if [[ "$USER" != 'root' ]]; then
-    echo "Sorry, you need to run this as root"
+if [[ $EUID -ne 0 ]]; then
+    echo "Error:This script must be run as root!"
     exit 1
 fi
 
 if [[ ! -e /dev/net/tun ]]; then
-    echo "TUN/TAP is not available"
+    echo "TUN/TAP is not available!"
     exit 1
 fi
 
@@ -27,21 +27,21 @@ echo "# Author: Teddysun <[email protected]>                         #"
 echo "#############################################################"
 echo ""
 
-tmpip=`ifconfig |grep 'inet' | grep -Evi '(inet6|127.0.0.1)' | awk '{print $2}' | cut -d: -f2 | tail -1`
+tmpip=`ip addr | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | egrep -v "^192\.168|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-2]\.|^10\.|^127\.|^255\." | head -n 1`
 if [[ "$tmpip" = "" ]]; then
-    tmpip=$(curl -4 icanhazip.com)
+    tmpip=`curl -s -4 icanhazip.com`
 fi
 
 echo "Please input IP-Range:"
 read -p "(Default Range: 10.1.2):" iprange
 if [ "$iprange" = "" ]; then
-	iprange="10.1.2"
+    iprange="10.1.2"
 fi
 
 echo "Please input PSK:"
 read -p "(Default PSK: vpn):" mypsk
 if [ "$mypsk" = "" ]; then
-	mypsk="vpn"
+    mypsk="vpn"
 fi
 
 clear

pptp.sh

@@ -7,13 +7,13 @@ export PATH
 #   Author: Teddysun <[email protected]>
 #===================================================================
 
-if [[ "$USER" != 'root' ]]; then
-    echo "Sorry, you need to run this as root"
+if [[ $EUID -ne 0 ]]; then
+    echo "Error:This script must be run as root!"
     exit 1
 fi
 
 if [[ ! -e /dev/net/tun ]]; then
-    echo "TUN/TAP is not available"
+    echo "TUN/TAP is not available!"
     exit 1
 fi
 
@@ -35,6 +35,7 @@ iptables --flush FORWARD
 rm -f /etc/pptpd.conf
 rm -rf /etc/ppp
 arch=`uname -m`
+IP=`ip addr | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | egrep -v "^192\.168|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-2]\.|^10\.|^127\.|^255\." | head -n 1`
 
 # Download pptpd
 if [ -s pptpd-1.3.4-2.el6.$arch.rpm ]; then
@@ -42,7 +43,7 @@ if [ -s pptpd-1.3.4-2.el6.$arch.rpm ]; then
 else
   echo "pptpd-1.3.4-2.el6.$arch.rpm not found!!!download now......"
   if ! wget http://lamp.teddysun.com/files/pptpd-1.3.4-2.el6.$arch.rpm;then
-    echo "Failed to download pptpd-1.3.4-2.el6.$arch.rpm,please download it to $cur_dir directory manually and rerun the install script."
+    echo "Failed to download pptpd-1.3.4-2.el6.$arch.rpm,please download it to $cur_dir directory manually and retry."
     exit 1
   fi
 fi
@@ -68,7 +69,7 @@ fi
 
 echo "vpn pptpd ${pass} *" >> /etc/ppp/chap-secrets
 
-iptables -t nat -A POSTROUTING -s 192.168.8.0/24 -j SNAT --to-source `ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk 'NR==1 { print $1}'`
+iptables -t nat -A POSTROUTING -s 192.168.8.0/24 -j SNAT --to-source ${IP}
 iptables -A FORWARD -p tcp --syn -s 192.168.8.0/24 -j TCPMSS --set-mss 1356
 service iptables save
 chkconfig --add pptpd
@@ -77,8 +78,11 @@ service iptables restart
 service pptpd start
 
 echo ""
-echo "VPN service is installed, your VPN username is vpn, VPN password is ${pass}"
-echo "Welcome to visit: http://teddysun.com"
+echo "PPTP VPN service is installed."
+echo "ServerIP:${IP}"
+echo "Username:vpn"
+echo "Password:${pass}"
+echo "Welcome to visit: http://teddysun.com/134.html"
 echo ""
 
 exit 0