diff --git a/README.md b/README.md index c38eb31..cdc194a 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## 安装 - sudo sh pptpd_x64.sh [subnet] + sudo sh pptpd_x64.sh [subnet] [password] ## 添加用户 diff --git a/pptpd_i686.sh b/pptpd_i686.sh index d91ccf9..f21c73e 100644 --- a/pptpd_i686.sh +++ b/pptpd_i686.sh @@ -1,8 +1,16 @@ -SUBNET=$1 - -if [ -z "${SUBNET}" ]; then +SUBNET= +PASS= + +if [ "$2" != "" ]; then + SUBNET=$1 + PASS=$2 +elif [ "$1" != "" ]; then + SUBNET=$1 + PASS=`openssl rand 6 -base64` +else SUBNET=192.168.0 + PASS=`openssl rand 6 -base64` fi yum remove -y pptpd ppp @@ -20,11 +28,7 @@ echo "remoteip ${SUBNET}.234-238,${SUBNET}.245" >> /etc/pptpd.conf echo "ms-dns 8.8.8.8" >> /etc/ppp/options.pptpd echo "ms-dns 8.8.4.4" >> /etc/ppp/options.pptpd -pass=`openssl rand 6 -base64` -if [ "$1" != "" ] -then pass=$1 -fi -echo "vpn pptpd ${pass} *" >> /etc/ppp/chap-secrets +echo "vpn pptpd ${PASS} *" >> /etc/ppp/chap-secrets sed -i 's/net.ipv4.ip_forward = 0/net.ipv4.ip_forward = 1/' /etc/sysctl.conf sed -i 's/net.ipv4.tcp_syncookies = 1/#net.ipv4.tcp_syncookies = 1/' /etc/sysctl.conf diff --git a/pptpd_x64.sh b/pptpd_x64.sh index 759b174..364d07d 100644 --- a/pptpd_x64.sh +++ b/pptpd_x64.sh @@ -1,8 +1,16 @@ -SUBNET=$1 - -if [ -z "${SUBNET}" ]; then +SUBNET= +PASS= + +if [ "$2" != "" ]; then + SUBNET=$1 + PASS=$2 +elif [ "$1" != "" ]; then + SUBNET=$1 + PASS=`openssl rand 6 -base64` +else SUBNET=192.168.0 + PASS=`openssl rand 6 -base64` fi yum remove -y pptpd ppp @@ -21,11 +29,7 @@ echo "remoteip ${SUBNET}.234-238,${SUBNET}.245" >> /etc/pptpd.conf echo "debug" >> /etc/ppp/options.pptpd echo "ms-dns 8.8.8.8" >> /etc/ppp/options.pptpd echo "ms-dns 8.8.4.4" >> /etc/ppp/options.pptpd -pass=`openssl rand 6 -base64` -if [ "$1" != "" ] -then pass=$1 -fi -echo "vpn pptpd ${pass} *" >> /etc/ppp/chap-secrets +echo "vpn pptpd ${PASS} *" >> /etc/ppp/chap-secrets sed -i 's/net.ipv4.ip_forward = 0/net.ipv4.ip_forward = 1/' /etc/sysctl.conf sed -i 's/net.ipv4.tcp_syncookies = 1/#net.ipv4.tcp_syncookies = 1/' /etc/sysctl.conf