From e319b28b289bb597576da71f73c63f3a253cc23d Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Fri, 26 Feb 2016 12:24:12 +0000 Subject: [PATCH 01/10] Added test promt for own DNS input. --- openvpn-install.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 21d4659..671c6fa 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -192,8 +192,13 @@ else echo " 3) OpenDNS" echo " 4) NTT" echo " 5) Hurricane Electric" + echo " 6) You specify the DNS server IP-s" read -p "DNS [1-6]: " -e -i 1 DNS - echo "" + if [[ "$DNS" = '6' ]]; then + read -p "Specify the DNS server IP-s. Space is the separator" -e -i 8.8.8.8 8.8.4.4 OWNDNS + else + echo "" + fi echo "Finally, tell me your name for the client cert" echo "Please, use one word only, no special characters" read -p "Client name: " -e -i client CLIENT @@ -266,6 +271,9 @@ ifconfig-pool-persist ipp.txt" > /etc/openvpn/server.conf 5) echo 'push "dhcp-option DNS 74.82.42.42"' >> /etc/openvpn/server.conf ;; + 6) + echo 'push "dhcp-option OWNDNS"' >> /etc/openvpn/server.conf + ;; esac echo "keepalive 10 120 comp-lzo From b75f79839d1f83c6ef637093fec6840dcc23b2c3 Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Fri, 26 Feb 2016 12:31:05 +0000 Subject: [PATCH 02/10] Updated readme. I hate markdown. --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d7c6ad9..f2a8215 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ Run the script and follow the assistant: Once it ends, you can run it again to add more users, remove some of them or even completely uninstall OpenVPN. +## This is a fork + +This is a fork of https://github.com/Nyr/openvpn-install. This is my test attempt to add a prompt to ask for your own DNS IP-s during installation. + ###I want to run my own VPN but don't have a server for that You can get a little VPS for just $2/month at [Host1Plus](https://affiliates.host1plus.com/ref/nyr.html). @@ -17,4 +21,4 @@ If you don't care about sharing an IP address with more people, check out the aw ###Donations -If you want to show your appreciation, you can donate via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VBAYDL34Z7J6L) or [Bitcoin](https://www.coinbase.com/Nyr). Thanks! \ No newline at end of file +If you want to show your appreciation, you can donate via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VBAYDL34Z7J6L) or [Bitcoin](https://www.coinbase.com/Nyr). Thanks! From 471649fd54d8706ecea5fd83fc99ca85fd7c8376 Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Sun, 28 Feb 2016 04:57:16 +0000 Subject: [PATCH 03/10] Argh git Updated the file here instead. --- openvpn-install.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 671c6fa..b079d79 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -192,7 +192,7 @@ else echo " 3) OpenDNS" echo " 4) NTT" echo " 5) Hurricane Electric" - echo " 6) You specify the DNS server IP-s" + echo " 6) You specify the DNS server IP-s" read -p "DNS [1-6]: " -e -i 1 DNS if [[ "$DNS" = '6' ]]; then read -p "Specify the DNS server IP-s. Space is the separator" -e -i 8.8.8.8 8.8.4.4 OWNDNS @@ -272,7 +272,10 @@ ifconfig-pool-persist ipp.txt" > /etc/openvpn/server.conf echo 'push "dhcp-option DNS 74.82.42.42"' >> /etc/openvpn/server.conf ;; 6) - echo 'push "dhcp-option OWNDNS"' >> /etc/openvpn/server.conf + for var in $OWNDNS; + do + echo 'push "dhcp-option OWNDNS"' >> /etc/openvpn/server.conf; + done ;; esac echo "keepalive 10 120 From 1a494cd70f74f39439e920445bbe949d39b30787 Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Sun, 28 Feb 2016 15:42:30 +0000 Subject: [PATCH 04/10] This is beta. The script works for own dns input. However, it needs testing at least on the different distros. --- openvpn-install.sh | 21 ++++++++++---------- test | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 test diff --git a/openvpn-install.sh b/openvpn-install.sh index b079d79..d0dcabb 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -193,12 +193,13 @@ else echo " 4) NTT" echo " 5) Hurricane Electric" echo " 6) You specify the DNS server IP-s" - read -p "DNS [1-6]: " -e -i 1 DNS - if [[ "$DNS" = '6' ]]; then - read -p "Specify the DNS server IP-s. Space is the separator" -e -i 8.8.8.8 8.8.4.4 OWNDNS - else - echo "" - fi + read -p "DNS [1-6]: " -e -i 6 DNS + if [[ "$DNS" = '6' ]]; then + echo "Please leave a space between DNS IP entries" + read -e -p "Specify the DNS server IP-s. Space is the separator: " OWNDNS + else + echo "" + fi echo "Finally, tell me your name for the client cert" echo "Please, use one word only, no special characters" read -p "Client name: " -e -i client CLIENT @@ -272,10 +273,10 @@ ifconfig-pool-persist ipp.txt" > /etc/openvpn/server.conf echo 'push "dhcp-option DNS 74.82.42.42"' >> /etc/openvpn/server.conf ;; 6) - for var in $OWNDNS; - do - echo 'push "dhcp-option OWNDNS"' >> /etc/openvpn/server.conf; - done + for i in `echo $OWNDNS|tr " " "\n"`; + do + echo 'push "dhcp-option DNS '"$i"'"' >> ./server.conf + done ;; esac echo "keepalive 10 120 diff --git a/test b/test new file mode 100644 index 0000000..72a8f24 --- /dev/null +++ b/test @@ -0,0 +1,48 @@ +#!/bin/bash +echo "What DNS do you want to use with the VPN?" + echo " 1) Current system resolvers" + echo " 2) Google" + echo " 3) OpenDNS" + echo " 4) NTT" + echo " 5) Hurricane Electric" + echo " 6) You specify the DNS server IP-s" + read -p "DNS [1-6]: " -e -i 6 DNS + if [[ "$DNS" = '6' ]]; then + echo "Please leave a space between DNS IP entries" + read -e -p "Specify the DNS server IP-s. Space is the separator: " OWNDNS + else + echo "" + fi + +# DNS + case $DNS in + 1) + # Obtain the resolvers from resolv.conf and use them for OpenVPN + grep -v '#' /etc/resolv.conf | grep 'nameserver' | grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | while read line; do + echo "push \"dhcp-option DNS $line\"" >> ./server.conf + done + ;; + 2) + echo 'push "dhcp-option DNS 8.8.8.8"' >> ./server.conf + echo 'push "dhcp-option DNS 8.8.4.4"' >> ./server.conf + ;; + 3) + echo 'push "dhcp-option DNS 208.67.222.222"' >> ./server.conf + echo 'push "dhcp-option DNS 208.67.220.220"' >> ./server.conf + ;; + 4) + echo 'push "dhcp-option DNS 129.250.35.250"' >> ./server.conf + echo 'push "dhcp-option DNS 129.250.35.251"' >> ./server.conf + ;; + 5) + echo 'push "dhcp-option DNS 74.82.42.42"' >> ./server.conf + ;; + 6) + for i in `echo $OWNDNS|tr " " "\n"`; + do + echo 'push "dhcp-option DNS '"$i"'"' >> ./server.conf + done + ;; + esac +cat ./server.conf +rm -f ./server.conf From 31049762e2b6a24c4f77a1ba21e70bc868a13830 Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Sun, 28 Feb 2016 17:37:01 +0000 Subject: [PATCH 05/10] Fixed the path the installer. --- openvpn-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index d0dcabb..6184990 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -275,7 +275,7 @@ ifconfig-pool-persist ipp.txt" > /etc/openvpn/server.conf 6) for i in `echo $OWNDNS|tr " " "\n"`; do - echo 'push "dhcp-option DNS '"$i"'"' >> ./server.conf + echo 'push "dhcp-option DNS '"$i"'"' >> /etc/openvpn/server.conf done ;; esac From 66ae7a1b3ceab37b54b54c2c9a2e012769a95886 Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Sun, 28 Feb 2016 17:40:48 +0000 Subject: [PATCH 06/10] Added example for the dialogue. --- openvpn-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/openvpn-install.sh b/openvpn-install.sh index 6184990..3dd75d6 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -196,6 +196,7 @@ else read -p "DNS [1-6]: " -e -i 6 DNS if [[ "$DNS" = '6' ]]; then echo "Please leave a space between DNS IP entries" + echo "Example: 8.8.8.8 8.8.4.4 129.250.35.250" read -e -p "Specify the DNS server IP-s. Space is the separator: " OWNDNS else echo "" From 5b7bc2f9579d5429553188c10ca75c15f7f30758 Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Sun, 28 Feb 2016 18:53:23 +0000 Subject: [PATCH 07/10] Tested on Windows 7 Home Premium and Windows Server 2012 R2. The following distros worked on aws.amazon.com: Ubuntu 14 LTS, Debian 7 32 bit, Debian 7 64 bit, Debian 8 64 bit, centos 6 64 bit. The install didn't work on RHEL 7 and SUSE Linux Enterprise Server 12 SP1 x86_64 (64-bit). --- test | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index 72a8f24..0000000 --- a/test +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -echo "What DNS do you want to use with the VPN?" - echo " 1) Current system resolvers" - echo " 2) Google" - echo " 3) OpenDNS" - echo " 4) NTT" - echo " 5) Hurricane Electric" - echo " 6) You specify the DNS server IP-s" - read -p "DNS [1-6]: " -e -i 6 DNS - if [[ "$DNS" = '6' ]]; then - echo "Please leave a space between DNS IP entries" - read -e -p "Specify the DNS server IP-s. Space is the separator: " OWNDNS - else - echo "" - fi - -# DNS - case $DNS in - 1) - # Obtain the resolvers from resolv.conf and use them for OpenVPN - grep -v '#' /etc/resolv.conf | grep 'nameserver' | grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | while read line; do - echo "push \"dhcp-option DNS $line\"" >> ./server.conf - done - ;; - 2) - echo 'push "dhcp-option DNS 8.8.8.8"' >> ./server.conf - echo 'push "dhcp-option DNS 8.8.4.4"' >> ./server.conf - ;; - 3) - echo 'push "dhcp-option DNS 208.67.222.222"' >> ./server.conf - echo 'push "dhcp-option DNS 208.67.220.220"' >> ./server.conf - ;; - 4) - echo 'push "dhcp-option DNS 129.250.35.250"' >> ./server.conf - echo 'push "dhcp-option DNS 129.250.35.251"' >> ./server.conf - ;; - 5) - echo 'push "dhcp-option DNS 74.82.42.42"' >> ./server.conf - ;; - 6) - for i in `echo $OWNDNS|tr " " "\n"`; - do - echo 'push "dhcp-option DNS '"$i"'"' >> ./server.conf - done - ;; - esac -cat ./server.conf -rm -f ./server.conf From b9333422e977720e228531531ab0ec6a8d720fe1 Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Sun, 28 Feb 2016 18:54:40 +0000 Subject: [PATCH 08/10] Tested on Windows 7 Home Premium and Windows Server 2012 R2. The following distros worked on aws.amazon.com: Ubuntu 14 LTS, Debian 7 32 bit, Debian 7 64 bit, Debian 8 64 bit, centos 6 64 bit. The install didn't work on RHEL 7 and SUSE Linux Enterprise Server 12 SP1 x86_64 (64-bit). --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f2a8215..3fdc2d4 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,12 @@ OpenVPN [road warrior](http://en.wikipedia.org/wiki/Road_warrior_%28computing%29 This script will let you setup your own VPN server in no more than a minute, even if you haven't used OpenVPN before. It has been designed to be as unobtrusive and universal as possible. +##Fork warning + +This is a fork of https://github.com/Nyr/openvpn-install as of 2016-02-28. + +Added and tested the option to prompt for own DNS IP-s, separated by spaces. + ###Installation Run the script and follow the assistant: @@ -10,10 +16,6 @@ Run the script and follow the assistant: Once it ends, you can run it again to add more users, remove some of them or even completely uninstall OpenVPN. -## This is a fork - -This is a fork of https://github.com/Nyr/openvpn-install. This is my test attempt to add a prompt to ask for your own DNS IP-s during installation. - ###I want to run my own VPN but don't have a server for that You can get a little VPS for just $2/month at [Host1Plus](https://affiliates.host1plus.com/ref/nyr.html). From f6a7ec84ff955c40b9eded5588bb4a08eaae8c4b Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Sun, 28 Feb 2016 18:58:45 +0000 Subject: [PATCH 09/10] Replaced the original prompt 1 for DNS selection. --- openvpn-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 3dd75d6..933579b 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -193,7 +193,7 @@ else echo " 4) NTT" echo " 5) Hurricane Electric" echo " 6) You specify the DNS server IP-s" - read -p "DNS [1-6]: " -e -i 6 DNS + read -p "DNS [1-6]: " -e -i 1 DNS if [[ "$DNS" = '6' ]]; then echo "Please leave a space between DNS IP entries" echo "Example: 8.8.8.8 8.8.4.4 129.250.35.250" From 11f2828ffb5e4d0f87872290f74b34362b008e10 Mon Sep 17 00:00:00 2001 From: Richard Skumat Date: Sun, 28 Feb 2016 19:01:57 +0000 Subject: [PATCH 10/10] Replaced the original prompt 1 for DNS selection. --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 3fdc2d4..ed7fee4 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,6 @@ OpenVPN [road warrior](http://en.wikipedia.org/wiki/Road_warrior_%28computing%29 This script will let you setup your own VPN server in no more than a minute, even if you haven't used OpenVPN before. It has been designed to be as unobtrusive and universal as possible. -##Fork warning - -This is a fork of https://github.com/Nyr/openvpn-install as of 2016-02-28. - -Added and tested the option to prompt for own DNS IP-s, separated by spaces. - ###Installation Run the script and follow the assistant: