From 1ffa3b1f7b5cfaa27a00b3f5834eddd2d1a1449c Mon Sep 17 00:00:00 2001 From: nsharief Date: Sat, 15 Jun 2024 16:26:50 +0100 Subject: [PATCH 1/4] Add DNS option 7 custom --- openvpn-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 98ffd1d..68a0bb0 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -190,8 +190,9 @@ if [[ ! -e /etc/openvpn/server/server.conf ]]; then echo " 4) OpenDNS" echo " 5) Quad9" echo " 6) AdGuard" + echo " 7) custom" read -p "DNS server [1]: " dns - until [[ -z "$dns" || "$dns" =~ ^[1-6]$ ]]; do + until [[ -z "$dns" || "$dns" =~ ^[1-7]$ ]]; do echo "$dns: invalid selection." read -p "DNS server [1]: " dns done From f6e5bb71f033940808847ff281de80df076a0a03 Mon Sep 17 00:00:00 2001 From: nsharief Date: Sat, 15 Jun 2024 18:51:12 +0100 Subject: [PATCH 2/4] Customer DNS option 7 --- openvpn-install.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/openvpn-install.sh b/openvpn-install.sh index 68a0bb0..8975618 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -196,6 +196,18 @@ if [[ ! -e /etc/openvpn/server/server.conf ]]; then echo "$dns: invalid selection." read -p "DNS server [1]: " dns done + if [[ "$dns" == 7 ]]; then + read -p "Enter custom DNS server 1: " dns_custom_1 + until [[ -z "$dns_custom_1" || "$dns_custom_1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; do + echo "$dns_custom_1: invalid DNS server." + read -p "Enter custom DNS server 1: " dns_custom_1 + done + read -p "Enter custom DNS server 2: " dns_custom_2 + until [[ -z "$dns_custom_2" || "$dns_custom_2" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; do + echo "$dns_custom_2: invalid DNS server." + read -p "Enter custom DNS server 2: " dns_custom_2 + done + fi echo echo "Enter a name for the first client:" read -p "Name [client]: " unsanitized_client From 9f3f90b5e86283aee9779c5ce713497caba08c1b Mon Sep 17 00:00:00 2001 From: nsharief Date: Sat, 15 Jun 2024 19:00:04 +0100 Subject: [PATCH 3/4] Customer DNS option 7 --- openvpn-install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openvpn-install.sh b/openvpn-install.sh index 8975618..fc7a950 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -334,6 +334,9 @@ server 10.8.0.0 255.255.255.0" > /etc/openvpn/server/server.conf echo 'push "dhcp-option DNS 94.140.14.14"' >> /etc/openvpn/server/server.conf echo 'push "dhcp-option DNS 94.140.15.15"' >> /etc/openvpn/server/server.conf ;; + 7) + echo 'push "dhcp-option DNS '$dns_custom_1'"' >> /etc/openvpn/server/server.conf + echo 'push "dhcp-option DNS '$dns_custom_2'"' >> /etc/openvpn/server/server.conf esac echo 'push "block-outside-dns"' >> /etc/openvpn/server/server.conf echo "keepalive 10 120 From 285a83ac3f66a0fd50e674a2511cf7c509e33adb Mon Sep 17 00:00:00 2001 From: nathansharief Date: Sat, 15 Jun 2024 19:06:35 +0100 Subject: [PATCH 4/4] Indentation fixes --- openvpn-install.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index fc7a950..dc0ef53 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -190,24 +190,24 @@ if [[ ! -e /etc/openvpn/server/server.conf ]]; then echo " 4) OpenDNS" echo " 5) Quad9" echo " 6) AdGuard" - echo " 7) custom" + echo " 7) custom" read -p "DNS server [1]: " dns until [[ -z "$dns" || "$dns" =~ ^[1-7]$ ]]; do echo "$dns: invalid selection." read -p "DNS server [1]: " dns done - if [[ "$dns" == 7 ]]; then - read -p "Enter custom DNS server 1: " dns_custom_1 - until [[ -z "$dns_custom_1" || "$dns_custom_1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; do - echo "$dns_custom_1: invalid DNS server." - read -p "Enter custom DNS server 1: " dns_custom_1 - done - read -p "Enter custom DNS server 2: " dns_custom_2 - until [[ -z "$dns_custom_2" || "$dns_custom_2" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; do - echo "$dns_custom_2: invalid DNS server." - read -p "Enter custom DNS server 2: " dns_custom_2 - done - fi + if [[ "$dns" == 7 ]]; then + read -p "Enter custom DNS server 1: " dns_custom_1 + until [[ "$dns_custom_1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; do + echo "$dns_custom_1: invalid DNS server." + read -p "Enter custom DNS server 1: " dns_custom_1 + done + read -p "Enter custom DNS server 2: " dns_custom_2 + until [[ "$dns_custom_2" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; do + echo "$dns_custom_2: invalid DNS server." + read -p "Enter custom DNS server 2: " dns_custom_2 + done + fi echo echo "Enter a name for the first client:" read -p "Name [client]: " unsanitized_client @@ -334,9 +334,9 @@ server 10.8.0.0 255.255.255.0" > /etc/openvpn/server/server.conf echo 'push "dhcp-option DNS 94.140.14.14"' >> /etc/openvpn/server/server.conf echo 'push "dhcp-option DNS 94.140.15.15"' >> /etc/openvpn/server/server.conf ;; - 7) - echo 'push "dhcp-option DNS '$dns_custom_1'"' >> /etc/openvpn/server/server.conf - echo 'push "dhcp-option DNS '$dns_custom_2'"' >> /etc/openvpn/server/server.conf + 7) + echo 'push "dhcp-option DNS '$dns_custom_1'"' >> /etc/openvpn/server/server.conf + echo 'push "dhcp-option DNS '$dns_custom_2'"' >> /etc/openvpn/server/server.conf esac echo 'push "block-outside-dns"' >> /etc/openvpn/server/server.conf echo "keepalive 10 120