Bernhard.Linz/openvpn-install
1
0
Fork 0
mirror of https://github.com/angristan/openvpn-install.git synced 2026-08-03 05:08:13 +02:00
Code Issues Projects Releases Wiki Activity

Fix shell formatting

Browse Source
This commit is contained in:
Stanislas Lange
2026-08-02 14:07:28 +02:00
parent 1a0fa9c9b0
commit 3274915ac7
2 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openvpn-install.sh
+129 -129
View File
@@ -636,7 +636,7 @@ is_valid_ipv4_cidr() {
else else
mask=$(((0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF)) mask=$(((0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF))
fi fi
(( (ip & mask) == ip )) (((ip & mask) == ip))
} }
expand_ipv6_address() { expand_ipv6_address() {
@@ -698,7 +698,7 @@ is_valid_ipv6_cidr() {
((hextets[index] == 0)) || return 1 ((hextets[index] == 0)) || return 1
else else
host_mask=$(((1 << (16 - remaining)) - 1)) host_mask=$(((1 << (16 - remaining)) - 1))
(( (hextets[index] & host_mask) == 0 )) || return 1 (((hextets[index] & host_mask) == 0)) || return 1
remaining=0 remaining=0
fi fi
done done
@@ -772,7 +772,7 @@ ipv4_cidrs_overlap() {
mask=$(((0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF)) mask=$(((0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF))
local first_ip=$(((10#${first_octets[0]} << 24) | (10#${first_octets[1]} << 16) | (10#${first_octets[2]} << 8) | 10#${first_octets[3]})) local first_ip=$(((10#${first_octets[0]} << 24) | (10#${first_octets[1]} << 16) | (10#${first_octets[2]} << 8) | 10#${first_octets[3]}))
local second_ip=$(((10#${second_octets[0]} << 24) | (10#${second_octets[1]} << 16) | (10#${second_octets[2]} << 8) | 10#${second_octets[3]})) local second_ip=$(((10#${second_octets[0]} << 24) | (10#${second_octets[1]} << 16) | (10#${second_octets[2]} << 8) | 10#${second_octets[3]}))
(( (first_ip & mask) == (second_ip & mask) )) (((first_ip & mask) == (second_ip & mask)))
} }
ipv6_cidrs_overlap() { ipv6_cidrs_overlap() {
@@ -793,7 +793,7 @@ ipv6_cidrs_overlap() {
remaining=$((remaining - 16)) remaining=$((remaining - 16))
else else
mask=$(((0xFFFF << (16 - remaining)) & 0xFFFF)) mask=$(((0xFFFF << (16 - remaining)) & 0xFFFF))
(( (first_hextets[index] & mask) == (second_hextets[index] & mask) )) (((first_hextets[index] & mask) == (second_hextets[index] & mask)))
return return
fi fi
done done
@@ -3196,132 +3196,132 @@ topology subnet" >>/etc/openvpn/server/server.conf
# DNS resolvers are only pushed when the VPN carries internet traffic. # DNS resolvers are only pushed when the VPN carries internet traffic.
if [[ $ROUTE_INTERNET == "y" ]]; then if [[ $ROUTE_INTERNET == "y" ]]; then
case $DNS in case $DNS in
system) system)
# Locate the proper resolv.conf # Locate the proper resolv.conf
# Needed for systems running systemd-resolved # Needed for systems running systemd-resolved
if grep -q "127.0.0.53" "/etc/resolv.conf"; then if grep -q "127.0.0.53" "/etc/resolv.conf"; then
RESOLVCONF='/run/systemd/resolve/resolv.conf' RESOLVCONF='/run/systemd/resolve/resolv.conf'
else else
RESOLVCONF='/etc/resolv.conf' RESOLVCONF='/etc/resolv.conf'
fi
# Obtain the resolvers from resolv.conf and use them for OpenVPN
sed -ne 's/^nameserver[[:space:]]\+\([^[:space:]]\+\).*$/\1/p' $RESOLVCONF | while read -r line; do
# Copy IPv4 resolvers if client has IPv4, or IPv6 resolvers if client has IPv6
if [[ $line =~ ^[0-9.]*$ ]] && [[ $CLIENT_IPV4 == 'y' ]]; then
echo "push \"dhcp-option DNS $line\"" >>/etc/openvpn/server/server.conf
elif [[ $line =~ : ]] && [[ $CLIENT_IPV6 == 'y' ]]; then
echo "push \"dhcp-option DNS $line\"" >>/etc/openvpn/server/server.conf
fi fi
done # Obtain the resolvers from resolv.conf and use them for OpenVPN
;; sed -ne 's/^nameserver[[:space:]]\+\([^[:space:]]\+\).*$/\1/p' $RESOLVCONF | while read -r line; do
unbound) # Copy IPv4 resolvers if client has IPv4, or IPv6 resolvers if client has IPv6
if [[ $CLIENT_IPV4 == 'y' ]]; then if [[ $line =~ ^[0-9.]*$ ]] && [[ $CLIENT_IPV4 == 'y' ]]; then
echo "push \"dhcp-option DNS $VPN_GATEWAY_IPV4\"" >>/etc/openvpn/server/server.conf echo "push \"dhcp-option DNS $line\"" >>/etc/openvpn/server/server.conf
fi elif [[ $line =~ : ]] && [[ $CLIENT_IPV6 == 'y' ]]; then
if [[ $CLIENT_IPV6 == 'y' ]]; then echo "push \"dhcp-option DNS $line\"" >>/etc/openvpn/server/server.conf
echo "push \"dhcp-option DNS $VPN_GATEWAY_IPV6\"" >>/etc/openvpn/server/server.conf fi
fi done
;; ;;
cloudflare) unbound)
if [[ $CLIENT_IPV4 == 'y' ]]; then if [[ $CLIENT_IPV4 == 'y' ]]; then
echo 'push "dhcp-option DNS 1.0.0.1"' >>/etc/openvpn/server/server.conf echo "push \"dhcp-option DNS $VPN_GATEWAY_IPV4\"" >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 1.1.1.1"' >>/etc/openvpn/server/server.conf fi
fi if [[ $CLIENT_IPV6 == 'y' ]]; then
if [[ $CLIENT_IPV6 == 'y' ]]; then echo "push \"dhcp-option DNS $VPN_GATEWAY_IPV6\"" >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2606:4700:4700::1001"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2606:4700:4700::1111"' >>/etc/openvpn/server/server.conf ;;
fi cloudflare)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
quad9) echo 'push "dhcp-option DNS 1.0.0.1"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 1.1.1.1"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 9.9.9.9"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 149.112.112.112"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2606:4700:4700::1001"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2606:4700:4700::1111"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2620:fe::fe"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2620:fe::9"' >>/etc/openvpn/server/server.conf ;;
fi quad9)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
quad9-uncensored) echo 'push "dhcp-option DNS 9.9.9.9"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 149.112.112.112"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 9.9.9.10"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 149.112.112.10"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2620:fe::fe"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2620:fe::9"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2620:fe::10"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2620:fe::fe:10"' >>/etc/openvpn/server/server.conf ;;
fi quad9-uncensored)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
fdn) echo 'push "dhcp-option DNS 9.9.9.10"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 149.112.112.10"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 80.67.169.40"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 80.67.169.12"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2620:fe::10"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2620:fe::fe:10"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2001:910:800::40"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2001:910:800::12"' >>/etc/openvpn/server/server.conf ;;
fi fdn)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
dnswatch) echo 'push "dhcp-option DNS 80.67.169.40"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 80.67.169.12"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 84.200.69.80"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 84.200.70.40"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2001:910:800::40"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2001:910:800::12"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2001:1608:10:25::1c04:b12f"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2001:1608:10:25::9249:d69b"' >>/etc/openvpn/server/server.conf ;;
fi dnswatch)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
opendns) echo 'push "dhcp-option DNS 84.200.69.80"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 84.200.70.40"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 208.67.222.222"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 208.67.220.220"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2001:1608:10:25::1c04:b12f"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2001:1608:10:25::9249:d69b"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2620:119:35::35"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2620:119:53::53"' >>/etc/openvpn/server/server.conf ;;
fi opendns)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
google) echo 'push "dhcp-option DNS 208.67.222.222"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 208.67.220.220"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 8.8.8.8"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 8.8.4.4"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2620:119:35::35"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2620:119:53::53"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2001:4860:4860::8888"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2001:4860:4860::8844"' >>/etc/openvpn/server/server.conf ;;
fi google)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
yandex) echo 'push "dhcp-option DNS 8.8.8.8"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 8.8.4.4"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 77.88.8.8"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 77.88.8.1"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2001:4860:4860::8888"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2001:4860:4860::8844"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2a02:6b8::feed:0ff"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2a02:6b8:0:1::feed:0ff"' >>/etc/openvpn/server/server.conf ;;
fi yandex)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
adguard) echo 'push "dhcp-option DNS 77.88.8.8"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 77.88.8.1"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 94.140.14.14"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 94.140.15.15"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2a02:6b8::feed:0ff"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2a02:6b8:0:1::feed:0ff"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2a10:50c0::ad1:ff"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2a10:50c0::ad2:ff"' >>/etc/openvpn/server/server.conf ;;
fi adguard)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
nextdns) echo 'push "dhcp-option DNS 94.140.14.14"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV4 == 'y' ]]; then echo 'push "dhcp-option DNS 94.140.15.15"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 45.90.28.167"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 45.90.30.167"' >>/etc/openvpn/server/server.conf if [[ $CLIENT_IPV6 == 'y' ]]; then
fi echo 'push "dhcp-option DNS 2a10:50c0::ad1:ff"' >>/etc/openvpn/server/server.conf
if [[ $CLIENT_IPV6 == 'y' ]]; then echo 'push "dhcp-option DNS 2a10:50c0::ad2:ff"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2a07:a8c0::"' >>/etc/openvpn/server/server.conf fi
echo 'push "dhcp-option DNS 2a07:a8c1::"' >>/etc/openvpn/server/server.conf ;;
fi nextdns)
;; if [[ $CLIENT_IPV4 == 'y' ]]; then
echo 'push "dhcp-option DNS 45.90.28.167"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 45.90.30.167"' >>/etc/openvpn/server/server.conf
fi
if [[ $CLIENT_IPV6 == 'y' ]]; then
echo 'push "dhcp-option DNS 2a07:a8c0::"' >>/etc/openvpn/server/server.conf
echo 'push "dhcp-option DNS 2a07:a8c1::"' >>/etc/openvpn/server/server.conf
fi
;;
custom) custom)
echo "push \"dhcp-option DNS $DNS1\"" >>/etc/openvpn/server/server.conf echo "push \"dhcp-option DNS $DNS1\"" >>/etc/openvpn/server/server.conf
if [[ $DNS2 != "" ]]; then if [[ $DNS2 != "" ]]; then
test/server-entrypoint.sh
+46 -46
View File
@@ -693,59 +693,59 @@ echo "Post-renewal client tests passed"
if [ "$ROUTE_INTERNET" = "y" ]; then if [ "$ROUTE_INTERNET" = "y" ]; then
echo "=== Verifying Unbound DNS Resolver ===" echo "=== Verifying Unbound DNS Resolver ==="
if [ -f /etc/unbound/unbound.conf ]; then if [ -f /etc/unbound/unbound.conf ]; then
# Verify Unbound is running (started by systemctl in install script) # Verify Unbound is running (started by systemctl in install script)
echo "Checking Unbound service status..." echo "Checking Unbound service status..."
for _ in $(seq 1 30); do for _ in $(seq 1 30); do
if pgrep -x unbound >/dev/null; then if pgrep -x unbound >/dev/null; then
echo "PASS: Unbound is running" echo "PASS: Unbound is running"
break break
fi
sleep 1
done
if ! pgrep -x unbound >/dev/null; then
echo "FAIL: Unbound is not running"
systemctl status unbound 2>&1 || true
journalctl -u unbound --no-pager -n 50 2>&1 || true
exit 1
fi fi
sleep 1 else
done echo "FAIL: /etc/unbound/unbound.conf not found"
if ! pgrep -x unbound >/dev/null; then
echo "FAIL: Unbound is not running"
systemctl status unbound 2>&1 || true
journalctl -u unbound --no-pager -n 50 2>&1 || true
exit 1 exit 1
fi fi
else
echo "FAIL: /etc/unbound/unbound.conf not found"
exit 1
fi
echo "" echo ""
echo "=== Verifying Unbound Installation ===" echo "=== Verifying Unbound Installation ==="
# Verify Unbound config exists in conf.d directory # Verify Unbound config exists in conf.d directory
UNBOUND_OPENVPN_CONF="/etc/unbound/unbound.conf.d/openvpn.conf" UNBOUND_OPENVPN_CONF="/etc/unbound/unbound.conf.d/openvpn.conf"
if [ -f "$UNBOUND_OPENVPN_CONF" ]; then if [ -f "$UNBOUND_OPENVPN_CONF" ]; then
echo "PASS: Found Unbound config at $UNBOUND_OPENVPN_CONF" echo "PASS: Found Unbound config at $UNBOUND_OPENVPN_CONF"
else else
echo "FAIL: OpenVPN Unbound config not found at $UNBOUND_OPENVPN_CONF" echo "FAIL: OpenVPN Unbound config not found at $UNBOUND_OPENVPN_CONF"
echo "Contents of /etc/unbound/:" echo "Contents of /etc/unbound/:"
ls -la /etc/unbound/ ls -la /etc/unbound/
ls -la /etc/unbound/unbound.conf.d/ 2>/dev/null || true ls -la /etc/unbound/unbound.conf.d/ 2>/dev/null || true
exit 1 exit 1
fi fi
# Verify Unbound listens on VPN gateway # Verify Unbound listens on VPN gateway
if grep -q "interface: $VPN_GATEWAY" "$UNBOUND_OPENVPN_CONF"; then if grep -q "interface: $VPN_GATEWAY" "$UNBOUND_OPENVPN_CONF"; then
echo "PASS: Unbound configured to listen on $VPN_GATEWAY" echo "PASS: Unbound configured to listen on $VPN_GATEWAY"
else else
echo "FAIL: Unbound not configured for $VPN_GATEWAY" echo "FAIL: Unbound not configured for $VPN_GATEWAY"
cat "$UNBOUND_OPENVPN_CONF" cat "$UNBOUND_OPENVPN_CONF"
exit 1 exit 1
fi fi
# Verify OpenVPN pushes correct DNS # Verify OpenVPN pushes correct DNS
if grep -q "push \"dhcp-option DNS $VPN_GATEWAY\"" /etc/openvpn/server/server.conf; then if grep -q "push \"dhcp-option DNS $VPN_GATEWAY\"" /etc/openvpn/server/server.conf; then
echo "PASS: OpenVPN configured to push Unbound DNS" echo "PASS: OpenVPN configured to push Unbound DNS"
else else
echo "FAIL: OpenVPN not configured to push Unbound DNS" echo "FAIL: OpenVPN not configured to push Unbound DNS"
grep "dhcp-option DNS" /etc/openvpn/server/server.conf || echo "No DNS push found" grep "dhcp-option DNS" /etc/openvpn/server/server.conf || echo "No DNS push found"
exit 1 exit 1
fi fi
echo "=== Unbound Installation Verified ===" echo "=== Unbound Installation Verified ==="
echo "" echo ""