diff --git a/auto_install/install.sh b/auto_install/install.sh index 7d32278..4d59171 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -370,16 +370,6 @@ setStaticIPv4() { fi } -setNetwork() { - # Sets the Network IP and Mask correctly - export PATH=${PATH}:/sbin:/usr/sbin - LOCALMASK=$(ifconfig "${pivpnInterface}" | awk '/Mask:/{ print $4;} ' | cut -c6-) - LOCALIP=$(ifconfig "${pivpnInterface}" | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*') - IFS=. read -r i1 i2 i3 i4 <<< "$LOCALIP" - IFS=. read -r m1 m2 m3 m4 <<< "$LOCALMASK" - LOCALNET=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))") -} - function valid_ip() { local ip=$1 @@ -893,9 +883,6 @@ EOF # Write config file for server using the template .txt file $SUDO cp /etc/.pivpn/server_config.txt /etc/openvpn/server.conf - $SUDO sed -i "s/LOCALNET/${LOCALNET}/g" /etc/openvpn/server.conf - $SUDO sed -i "s/LOCALMASK/${LOCALMASK}/g" /etc/openvpn/server.conf - # Set the user encryption key size $SUDO sed -i "s/\(dh \/etc\/openvpn\/easy-rsa\/pki\/dh\).*/\1${ENCRYPT}.pem/" /etc/openvpn/server.conf @@ -1270,9 +1257,6 @@ main() { setStaticIPv4 fi - # Set the Network IP and Mask correctly - setNetwork - # Choose the user for the ovpns chooseUser diff --git a/server_config.txt b/server_config.txt index a7e6b17..128528e 100644 --- a/server_config.txt +++ b/server_config.txt @@ -7,14 +7,6 @@ key /etc/openvpn/easy-rsa/pki/private/server.key dh /etc/openvpn/easy-rsa/pki/dh2048.pem topology subnet server 10.8.0.0 255.255.255.0 -# server and remote endpoints -ifconfig 10.8.0.1 10.8.0.2 -# Add route to Client routing table for the OpenVPN Server -push "route 10.8.0.1 255.255.255.255" -# Add route to Client routing table for the OPenVPN Subnet -push "route 10.8.0.0 255.255.255.0" -# your local subnet -push "route LOCALNET LOCALMASK" # Set your primary domain name server address for clients push "dhcp-option DNS 8.8.8.8" push "dhcp-option DNS 8.8.4.4"