mirror of
https://github.com/hwdsl2/wireguard-install.git
synced 2024-09-22 00:00:55 +02:00
Cleanup
This commit is contained in:
parent
f2a0815898
commit
9e4fced00b
|
@ -32,16 +32,6 @@ check_ip() {
|
||||||
printf '%s' "$1" | tr -d '\n' | grep -Eq "$IP_REGEX"
|
printf '%s' "$1" | tr -d '\n' | grep -Eq "$IP_REGEX"
|
||||||
}
|
}
|
||||||
|
|
||||||
find_public_ip() {
|
|
||||||
ip_url1="http://ipv4.icanhazip.com"
|
|
||||||
ip_url2="http://ip1.dynupdate.no-ip.com"
|
|
||||||
# Get public IP and sanitize with grep
|
|
||||||
get_public_ip=$(grep -m 1 -oE '^[0-9]{1,3}(\.[0-9]{1,3}){3}$' <<< "$(wget -T 10 -t 1 -4qO- "$ip_url1" || curl -m 10 -4Ls "$ip_url1")")
|
|
||||||
if [ -z "$get_public_ip" ]; then
|
|
||||||
get_public_ip=$(grep -m 1 -oE '^[0-9]{1,3}(\.[0-9]{1,3}){3}$' <<< "$(wget -T 10 -t 1 -4qO- "$ip_url2" || curl -m 10 -4Ls "$ip_url2")")
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
abort_and_exit() {
|
abort_and_exit() {
|
||||||
echo "Abort. No changes were made." >&2
|
echo "Abort. No changes were made." >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -59,6 +49,16 @@ get_export_dir() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
find_public_ip() {
|
||||||
|
ip_url1="http://ipv4.icanhazip.com"
|
||||||
|
ip_url2="http://ip1.dynupdate.no-ip.com"
|
||||||
|
# Get public IP and sanitize with grep
|
||||||
|
get_public_ip=$(grep -m 1 -oE '^[0-9]{1,3}(\.[0-9]{1,3}){3}$' <<< "$(wget -T 10 -t 1 -4qO- "$ip_url1" || curl -m 10 -4Ls "$ip_url1")")
|
||||||
|
if ! check_ip "$get_public_ip"; then
|
||||||
|
get_public_ip=$(grep -m 1 -oE '^[0-9]{1,3}(\.[0-9]{1,3}){3}$' <<< "$(wget -T 10 -t 1 -4qO- "$ip_url2" || curl -m 10 -4Ls "$ip_url2")")
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
update_sysctl() {
|
update_sysctl() {
|
||||||
# Enable net.ipv4.ip_forward for the system
|
# Enable net.ipv4.ip_forward for the system
|
||||||
echo 'net.ipv4.ip_forward=1' > /etc/sysctl.d/99-wireguard-forward.conf
|
echo 'net.ipv4.ip_forward=1' > /etc/sysctl.d/99-wireguard-forward.conf
|
||||||
|
@ -270,6 +270,7 @@ if systemd-detect-virt -cq 2>/dev/null; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
auto=0
|
||||||
if [[ ! -e /etc/wireguard/wg0.conf ]]; then
|
if [[ ! -e /etc/wireguard/wg0.conf ]]; then
|
||||||
if [ "$os" = "centos" ]; then
|
if [ "$os" = "centos" ]; then
|
||||||
if grep -qs "hwdsl2 VPN script" /etc/sysconfig/nftables.conf \
|
if grep -qs "hwdsl2 VPN script" /etc/sysconfig/nftables.conf \
|
||||||
|
@ -278,7 +279,6 @@ if [[ ! -e /etc/wireguard/wg0.conf ]]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
auto=0
|
|
||||||
while [ "$#" -gt 0 ]; do
|
while [ "$#" -gt 0 ]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
--auto)
|
--auto)
|
||||||
|
@ -354,7 +354,7 @@ if [[ ! -e /etc/wireguard/wg0.conf ]]; then
|
||||||
# If $ip is a private IP address, the server must be behind NAT
|
# If $ip is a private IP address, the server must be behind NAT
|
||||||
if printf '%s' "$ip" | grep -qE '^(10|127|172\.(1[6-9]|2[0-9]|3[0-1])|192\.168|169\.254)\.'; then
|
if printf '%s' "$ip" | grep -qE '^(10|127|172\.(1[6-9]|2[0-9]|3[0-1])|192\.168|169\.254)\.'; then
|
||||||
find_public_ip
|
find_public_ip
|
||||||
if [ -z "$get_public_ip" ]; then
|
if ! check_ip "$get_public_ip"; then
|
||||||
if [ "$auto" = 0 ]; then
|
if [ "$auto" = 0 ]; then
|
||||||
echo
|
echo
|
||||||
echo "This server is behind NAT. What is the public IPv4 address?"
|
echo "This server is behind NAT. What is the public IPv4 address?"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user