[backport] Remove IP address detection fallback
It was never used, the one-liner is enough.
This commit is contained in:
parent
61d89e3ba2
commit
064fbb4560
1 changed files with 2 additions and 7 deletions
|
|
@ -83,13 +83,6 @@ newclient () {
|
||||||
echo "</tls-auth>" >> $homeDir/$1.ovpn
|
echo "</tls-auth>" >> $homeDir/$1.ovpn
|
||||||
}
|
}
|
||||||
|
|
||||||
# Try to get our IP from the system and fallback to the Internet.
|
|
||||||
# I do this to make the script compatible with NATed servers (LowEndSpirit/Scaleway)
|
|
||||||
# and to avoid getting an IPv6.
|
|
||||||
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)
|
|
||||||
if [[ "$IP" = "" ]]; then
|
|
||||||
IP=$(wget -qO- ipv4.icanhazip.com)
|
|
||||||
fi
|
|
||||||
# Get Internet network interface with default route
|
# Get Internet network interface with default route
|
||||||
NIC=$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -1)
|
NIC=$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -1)
|
||||||
|
|
||||||
|
|
@ -220,6 +213,8 @@ else
|
||||||
echo "I need to know the IPv4 address of the network interface you want OpenVPN listening to."
|
echo "I need to know the IPv4 address of the network interface you want OpenVPN listening to."
|
||||||
echo "If your server is running behind a NAT, (e.g. LowEndSpirit, Scaleway) leave the IP address as it is. (local/private IP)"
|
echo "If your server is running behind a NAT, (e.g. LowEndSpirit, Scaleway) leave the IP address as it is. (local/private IP)"
|
||||||
echo "Otherwise, it should be your public IPv4 address."
|
echo "Otherwise, it should be your public IPv4 address."
|
||||||
|
# Autodetect IP address and pre-fill for the user
|
||||||
|
IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
|
||||||
read -p "IP address: " -e -i $IP IP
|
read -p "IP address: " -e -i $IP IP
|
||||||
echo ""
|
echo ""
|
||||||
echo "What port do you want for OpenVPN?"
|
echo "What port do you want for OpenVPN?"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue