From fbec57d1fda70341394bfd2bc90e1dab0af2c125 Mon Sep 17 00:00:00 2001 From: cfcolaco Date: Thu, 29 Jun 2017 12:03:47 +0100 Subject: [PATCH 1/9] changed to new openvpn repos --- auto_install/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 85575c4..ea1172c 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -431,7 +431,7 @@ update_package_cache() { if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - - echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null + echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." $SUDO apt-get -qq update & spinner $! echo " done!" @@ -521,7 +521,7 @@ checkForDependencies() { if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then if [[ $OSCN == "trusty" || $OSCN == "jessie" || $OSCN == "wheezy" ]]; then wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - - echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null + echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." $SUDO apt-get -qq update & spinner $! echo " done!" From b3ebdb804aa3754a25d6553073403902cf1caa42 Mon Sep 17 00:00:00 2001 From: Inventor Date: Sat, 5 Aug 2017 19:33:37 -0400 Subject: [PATCH 2/9] Added Related Projects section (#325) * Added a related projects section * Added links (whoops) --- README.md | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index d290393..e645f38 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ About Visit the [PiVPN](http://pivpn.io) site for more information. This is a set of shell scripts that serve to easily turn your Raspberry Pi (TM) -into a VPN server using the free, open-source [OpenVPN](https://openvpn.net) software. +into a VPN server using the free, open-source [OpenVPN](https://openvpn.net) software. Have you been looking for a good guide or tutorial for installing openvpn on a raspberry pi or ubuntu based server? Run this script and you don't need a guide or tutorial, this will do it all for you, in a fraction of the time and with hardened security settings in place by default. @@ -31,7 +31,7 @@ You should also setup your Pi with a static IP address (see either source 1 or 2 at the bottom of this Readme) but it is not required as the script can do this for you. You will need to have your router forward UDP port 1194 (or whatever custom port you may have chose in the installer) (varies by model & manufacturer; consult your router manufacturer's - documentation to do this). + documentation to do this). Enabling SSH on your Pi is also highly recommended, so that you can run a very compact headless server without a monitor or keyboard and be able to access it even more conveniently (This is also covered by source 2). @@ -54,7 +54,7 @@ If you're unsure or don't have a convincing reason one way or the other I'd use > Up to 4096-bit is accepted by nearly all RSA systems (including OpenVPN,) but use of keys this large will dramatically increase generation time, TLS handshake delays, and CPU usage for TLS operations; the benefit beyond 2048-bit keys is small enough not to be of great use at the current time. It is often a larger benefit to consider lower validity times than more bits past 2048, but that is for you to decide. After this, the script will go back to the command line as it builds the server's own -certificate authority. The script will ask you if you'd like to change the certificate fields, +certificate authority. The script will ask you if you'd like to change the certificate fields, the default port, client's DNS server, etc. If you know you want to change these things, feel free, and the script will put all the information where it needs to go in the various config files. If you aren't sure, it has been designed that you can simply hit 'Enter' through all the questions @@ -73,7 +73,7 @@ Managing the PiVPN After the installation is complete you can use the command 'pivpn' to manage the server. -"pivpn add" +"pivpn add" You will be prompted to enter a name for your client. Pick anything you like and hit 'enter'. You will be asked to enter a pass phrase for the client key; make sure it's one you'll remember. The script will assemble the client .ovpn file and place it in the directory 'ovpns' within your @@ -83,10 +83,10 @@ If you need to create a client certificate that is not password protected (IE fo then you can use the 'pivpn add nopass' option to generate that. "pivpn revoke" -Asks you for the name of the client to revoke. Once you revoke a client, it will no longer allow you to use +Asks you for the name of the client to revoke. Once you revoke a client, it will no longer allow you to use the given client certificate (ovpn config) to connect. This is useful for many reasons but some ex: -You have a profile on a mobile phone and it was lost or stolen. Revoke its cert and generate a new -one for your new phone. Or even if you suspect that a cert may have been compromised in any way, +You have a profile on a mobile phone and it was lost or stolen. Revoke its cert and generate a new +one for your new phone. Or even if you suspect that a cert may have been compromised in any way, just revoke it and generate a new one. "pivpn list" @@ -123,7 +123,7 @@ Removing PiVPN If at any point you wish to remove OpenVPN from your Pi and revert it to a pre-installation state, such as if you want to undo a failed installation to try again or you want to remove OpenVPN without installing a fresh Raspbian image, just run -'pivpn uninstall' +'pivpn uninstall' Feedback & Support -------- @@ -135,14 +135,25 @@ to keep things sorted. [[DISCONTINUED APRIL 17]] You can also post on the [Google Space](https://goo.gl/spaces/kgp2Mcy5RDfZ5SSf8) I created for PiVPN, especially suited for general questions or discussions. -You can also join #pivpn on freenode in IRC for community support or general questions. +You can also join #pivpn on freenode in IRC for community support or general questions. + +Related Projects +-------- +[StarshipEngineer/OpenVPN-Setup](https://github.com/StarshipEngineer/OpenVPN-Setup) +Shell script to set up a OpenVPN server. + +[InnovativeInventor/docker-pivpn](https://github.com/InnovativeInventor/docker-pivpn) +A secure docker container that sets up PiVPN and SSH. + +[OpenVPN](https://openvpn.net) +The foundation for all open-source VPN projects. Contributions ------------- -I'm also interested in improving this script, please check the current issues to see where you can help. If you have any +I'm also interested in improving this script, please check the current issues to see where you can help. If you have any feature ideas or requests, or are interested in adding your ideas to it, -testing it on other platforms, please comment or leave a pull request. +testing it on other platforms, please comment or leave a pull request. If you contribute often I can add you as a member of the PiVPN project. I will be happy to work with you! @@ -158,4 +169,3 @@ sources. 4. And as always the ever vigilant [EFF] (https://www.eff.org/) I don't take donations at this time but if you want to show your appreciation to me, then contribute or leave feedback on suggestions or improvements. - From f385a3ec536ebb344811ee3d4b36ad552fcbb560 Mon Sep 17 00:00:00 2001 From: Jason Healy Date: Fri, 11 Aug 2017 01:22:06 -0600 Subject: [PATCH 3/9] fix markdown link syntax --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e645f38..332b80b 100644 --- a/README.md +++ b/README.md @@ -164,8 +164,8 @@ sources. 2. And the code at [pi-hole.net](https://github.com/pi-hole/pi-hole) -3. Of course there is [OpenVPN] (https://openvpn.net) +3. Of course there is [OpenVPN](https://openvpn.net) -4. And as always the ever vigilant [EFF] (https://www.eff.org/) +4. And as always the ever vigilant [EFF](https://www.eff.org/) I don't take donations at this time but if you want to show your appreciation to me, then contribute or leave feedback on suggestions or improvements. From 2626127be18fca41802fa009453877cb6d0544e6 Mon Sep 17 00:00:00 2001 From: cfcolaco Date: Sun, 8 Oct 2017 12:54:24 +0100 Subject: [PATCH 4/9] Added support to Stretch, Fixed some texts, Removed some lines for testing pruposes --- auto_install/install.sh | 68 +++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 9c580a0..fcfde96 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -61,14 +61,14 @@ dhcpcdFile=/etc/dhcpcd.conf # Next see if we are on a tested and supported OS function noOS_Support() { whiptail --msgbox --backtitle "INVALID OS DETECTED" --title "Invalid OS" "We have not been able to detect a supported OS. -Currently this installer supports Raspbian (or Devuan) jessie, Ubuntu 14.04 (trusty), and Ubuntu 16.04 (xenial). +Currently this installer supports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). If you think you received this message in error, you can post an issue on the GitHub at https://github.com/pivpn/pivpn/issues." ${r} ${c} exit 1 } function maybeOS_Support() { if (whiptail --backtitle "Not Supported OS" --title "Not Supported OS" --yesno "You are on an OS that we have not tested but MAY work. -Currently this installer supports Raspbian (or Devuan) jessie, Ubuntu 14.04 (trusty), and Ubuntu 16.04 (xenial). +Currently this installer ssupports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). Would you like to continue anyway?" ${r} ${c}) then echo "::: Did not detect perfectly supported OS but," echo "::: Continuing installation at user's own risk..." @@ -88,7 +88,7 @@ distro_check() { case ${PLAT} in Ubuntu|Raspbian|Debian|Devuan) case ${OSCN} in - trusty|xenial|jessie) + trusty|xenial|jessie|stretch) ;; *) maybeOS_Support @@ -111,6 +111,9 @@ distro_check() { if grep -q jessie /etc/os-release; then PLAT="Raspbian" OSCN="jessie" + elif grep -q stretch /etc/os-release; then + PLAT="Raspbian" + OSCN="stretch" else PLAT="Ubuntu" OSCN="unknown" @@ -435,31 +438,33 @@ update_package_cache() { timestampAsDate=$(date -d @"${timestamp}" "+%b %e") today=$(date "+%b %e") -<<<<<<< HEAD - case ${PLAT} in - Ubuntu|Debian|Devuan) - case ${OSCN} in - trusty|jessie|wheezy) - wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - - echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null - echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." - $SUDO apt-get -qq update & spinner $! - echo " done!" - ;; - esac - ;; - esac -======= - if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then - if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then - wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - - echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null - echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." - $SUDO apt-get -qq update & spinner $! - echo " done!" - fi - fi ->>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a +#### REMOVE IF TESTING WORKS ##### +#<<<<<<< HEAD +# case ${PLAT} in +# Ubuntu|Debian|Devuan) +# case ${OSCN} in +# trusty|jessie|wheezy) +# wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - +# echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null +# echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." +# $SUDO apt-get -qq update & spinner $! +# echo " done!" +# ;; +# esac +# ;; +# esac +#======= +# if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then +# if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then +# wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - +# echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null +# echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." +# $SUDO apt-get -qq update & spinner $! +# echo " done!" +# fi +# fi +#>>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a +##### REMOVE UNTIL THIS POINT###### if [ ! "${today}" == "${timestampAsDate}" ]; then #update package lists @@ -543,11 +548,10 @@ checkForDependencies() { timestampAsDate=$(date -d @"$timestamp" "+%b %e") today=$(date "+%b %e") -<<<<<<< HEAD case ${PLAT} in Ubuntu|Debian|Devuan) case ${OSCN} in - trusty|jessie|wheezy) + trusty|jessie|wheezy|stretch) wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." @@ -557,9 +561,8 @@ checkForDependencies() { esac ;; esac -======= if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then - if [[ $OSCN == "trusty" || $OSCN == "jessie" || $OSCN == "wheezy" ]]; then + if [[ $OSCN == "trusty" || $OSCN == "jessie" || $OSCN == "wheezy" || $OSCN == "stretch" ]]; then wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." @@ -567,7 +570,6 @@ checkForDependencies() { echo " done!" fi fi ->>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a if [ ! "$today" == "$timestampAsDate" ]; then #update package lists From 6e8d6d24b51c1bc8a7316428ca81fcd59e960803 Mon Sep 17 00:00:00 2001 From: cfcolaco Date: Sun, 8 Oct 2017 13:08:57 +0100 Subject: [PATCH 5/9] Revert "Added support to Stretch, Fixed some texts, Removed some lines for testing pruposes" This reverts commit 2626127be18fca41802fa009453877cb6d0544e6. --- auto_install/install.sh | 68 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index fcfde96..9c580a0 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -61,14 +61,14 @@ dhcpcdFile=/etc/dhcpcd.conf # Next see if we are on a tested and supported OS function noOS_Support() { whiptail --msgbox --backtitle "INVALID OS DETECTED" --title "Invalid OS" "We have not been able to detect a supported OS. -Currently this installer supports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). +Currently this installer supports Raspbian (or Devuan) jessie, Ubuntu 14.04 (trusty), and Ubuntu 16.04 (xenial). If you think you received this message in error, you can post an issue on the GitHub at https://github.com/pivpn/pivpn/issues." ${r} ${c} exit 1 } function maybeOS_Support() { if (whiptail --backtitle "Not Supported OS" --title "Not Supported OS" --yesno "You are on an OS that we have not tested but MAY work. -Currently this installer ssupports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). +Currently this installer supports Raspbian (or Devuan) jessie, Ubuntu 14.04 (trusty), and Ubuntu 16.04 (xenial). Would you like to continue anyway?" ${r} ${c}) then echo "::: Did not detect perfectly supported OS but," echo "::: Continuing installation at user's own risk..." @@ -88,7 +88,7 @@ distro_check() { case ${PLAT} in Ubuntu|Raspbian|Debian|Devuan) case ${OSCN} in - trusty|xenial|jessie|stretch) + trusty|xenial|jessie) ;; *) maybeOS_Support @@ -111,9 +111,6 @@ distro_check() { if grep -q jessie /etc/os-release; then PLAT="Raspbian" OSCN="jessie" - elif grep -q stretch /etc/os-release; then - PLAT="Raspbian" - OSCN="stretch" else PLAT="Ubuntu" OSCN="unknown" @@ -438,33 +435,31 @@ update_package_cache() { timestampAsDate=$(date -d @"${timestamp}" "+%b %e") today=$(date "+%b %e") -#### REMOVE IF TESTING WORKS ##### -#<<<<<<< HEAD -# case ${PLAT} in -# Ubuntu|Debian|Devuan) -# case ${OSCN} in -# trusty|jessie|wheezy) -# wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - -# echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null -# echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." -# $SUDO apt-get -qq update & spinner $! -# echo " done!" -# ;; -# esac -# ;; -# esac -#======= -# if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then -# if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then -# wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - -# echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null -# echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." -# $SUDO apt-get -qq update & spinner $! -# echo " done!" -# fi -# fi -#>>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a -##### REMOVE UNTIL THIS POINT###### +<<<<<<< HEAD + case ${PLAT} in + Ubuntu|Debian|Devuan) + case ${OSCN} in + trusty|jessie|wheezy) + wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - + echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null + echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." + $SUDO apt-get -qq update & spinner $! + echo " done!" + ;; + esac + ;; + esac +======= + if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then + if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then + wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - + echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null + echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." + $SUDO apt-get -qq update & spinner $! + echo " done!" + fi + fi +>>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a if [ ! "${today}" == "${timestampAsDate}" ]; then #update package lists @@ -548,10 +543,11 @@ checkForDependencies() { timestampAsDate=$(date -d @"$timestamp" "+%b %e") today=$(date "+%b %e") +<<<<<<< HEAD case ${PLAT} in Ubuntu|Debian|Devuan) case ${OSCN} in - trusty|jessie|wheezy|stretch) + trusty|jessie|wheezy) wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." @@ -561,8 +557,9 @@ checkForDependencies() { esac ;; esac +======= if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then - if [[ $OSCN == "trusty" || $OSCN == "jessie" || $OSCN == "wheezy" || $OSCN == "stretch" ]]; then + if [[ $OSCN == "trusty" || $OSCN == "jessie" || $OSCN == "wheezy" ]]; then wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." @@ -570,6 +567,7 @@ checkForDependencies() { echo " done!" fi fi +>>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a if [ ! "$today" == "$timestampAsDate" ]; then #update package lists From 29a5dbb22b773f8093497126d13a86d7e1bbfbe1 Mon Sep 17 00:00:00 2001 From: cfcolaco Date: Sun, 8 Oct 2017 13:19:01 +0100 Subject: [PATCH 6/9] Revert "Revert "Added support to Stretch, Fixed some texts, Removed some lines for testing pruposes"" This reverts commit 6e8d6d24b51c1bc8a7316428ca81fcd59e960803. --- auto_install/install.sh | 68 +++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 9c580a0..fcfde96 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -61,14 +61,14 @@ dhcpcdFile=/etc/dhcpcd.conf # Next see if we are on a tested and supported OS function noOS_Support() { whiptail --msgbox --backtitle "INVALID OS DETECTED" --title "Invalid OS" "We have not been able to detect a supported OS. -Currently this installer supports Raspbian (or Devuan) jessie, Ubuntu 14.04 (trusty), and Ubuntu 16.04 (xenial). +Currently this installer supports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). If you think you received this message in error, you can post an issue on the GitHub at https://github.com/pivpn/pivpn/issues." ${r} ${c} exit 1 } function maybeOS_Support() { if (whiptail --backtitle "Not Supported OS" --title "Not Supported OS" --yesno "You are on an OS that we have not tested but MAY work. -Currently this installer supports Raspbian (or Devuan) jessie, Ubuntu 14.04 (trusty), and Ubuntu 16.04 (xenial). +Currently this installer ssupports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). Would you like to continue anyway?" ${r} ${c}) then echo "::: Did not detect perfectly supported OS but," echo "::: Continuing installation at user's own risk..." @@ -88,7 +88,7 @@ distro_check() { case ${PLAT} in Ubuntu|Raspbian|Debian|Devuan) case ${OSCN} in - trusty|xenial|jessie) + trusty|xenial|jessie|stretch) ;; *) maybeOS_Support @@ -111,6 +111,9 @@ distro_check() { if grep -q jessie /etc/os-release; then PLAT="Raspbian" OSCN="jessie" + elif grep -q stretch /etc/os-release; then + PLAT="Raspbian" + OSCN="stretch" else PLAT="Ubuntu" OSCN="unknown" @@ -435,31 +438,33 @@ update_package_cache() { timestampAsDate=$(date -d @"${timestamp}" "+%b %e") today=$(date "+%b %e") -<<<<<<< HEAD - case ${PLAT} in - Ubuntu|Debian|Devuan) - case ${OSCN} in - trusty|jessie|wheezy) - wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - - echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null - echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." - $SUDO apt-get -qq update & spinner $! - echo " done!" - ;; - esac - ;; - esac -======= - if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then - if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then - wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - - echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null - echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." - $SUDO apt-get -qq update & spinner $! - echo " done!" - fi - fi ->>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a +#### REMOVE IF TESTING WORKS ##### +#<<<<<<< HEAD +# case ${PLAT} in +# Ubuntu|Debian|Devuan) +# case ${OSCN} in +# trusty|jessie|wheezy) +# wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - +# echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null +# echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." +# $SUDO apt-get -qq update & spinner $! +# echo " done!" +# ;; +# esac +# ;; +# esac +#======= +# if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then +# if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then +# wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - +# echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null +# echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." +# $SUDO apt-get -qq update & spinner $! +# echo " done!" +# fi +# fi +#>>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a +##### REMOVE UNTIL THIS POINT###### if [ ! "${today}" == "${timestampAsDate}" ]; then #update package lists @@ -543,11 +548,10 @@ checkForDependencies() { timestampAsDate=$(date -d @"$timestamp" "+%b %e") today=$(date "+%b %e") -<<<<<<< HEAD case ${PLAT} in Ubuntu|Debian|Devuan) case ${OSCN} in - trusty|jessie|wheezy) + trusty|jessie|wheezy|stretch) wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." @@ -557,9 +561,8 @@ checkForDependencies() { esac ;; esac -======= if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then - if [[ $OSCN == "trusty" || $OSCN == "jessie" || $OSCN == "wheezy" ]]; then + if [[ $OSCN == "trusty" || $OSCN == "jessie" || $OSCN == "wheezy" || $OSCN == "stretch" ]]; then wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." @@ -567,7 +570,6 @@ checkForDependencies() { echo " done!" fi fi ->>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a if [ ! "$today" == "$timestampAsDate" ]; then #update package lists From c1918417d60881391fee52fff1546e55d2f6ca1a Mon Sep 17 00:00:00 2001 From: cfcolaco Date: Sun, 8 Oct 2017 18:27:43 +0100 Subject: [PATCH 7/9] added support to Stretch, removed useless code, added info about stretch support --- auto_install/install.sh | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index fcfde96..95d3187 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -438,33 +438,6 @@ update_package_cache() { timestampAsDate=$(date -d @"${timestamp}" "+%b %e") today=$(date "+%b %e") -#### REMOVE IF TESTING WORKS ##### -#<<<<<<< HEAD -# case ${PLAT} in -# Ubuntu|Debian|Devuan) -# case ${OSCN} in -# trusty|jessie|wheezy) -# wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - -# echo "deb http://swupdate.openvpn.net/apt $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null -# echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." -# $SUDO apt-get -qq update & spinner $! -# echo " done!" -# ;; -# esac -# ;; -# esac -#======= -# if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then -# if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then -# wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add - -# echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null -# echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..." -# $SUDO apt-get -qq update & spinner $! -# echo " done!" -# fi -# fi -#>>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a -##### REMOVE UNTIL THIS POINT###### if [ ! "${today}" == "${timestampAsDate}" ]; then #update package lists From 664087bf92e6c631e9c009ad15e6960a8d041863 Mon Sep 17 00:00:00 2001 From: cfcolaco Date: Sun, 8 Oct 2017 19:47:30 +0100 Subject: [PATCH 8/9] fixed typo --- auto_install/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 95d3187..0238527 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -68,7 +68,7 @@ If you think you received this message in error, you can post an issue on the Gi function maybeOS_Support() { if (whiptail --backtitle "Not Supported OS" --title "Not Supported OS" --yesno "You are on an OS that we have not tested but MAY work. -Currently this installer ssupports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). +Currently this installer supports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). Would you like to continue anyway?" ${r} ${c}) then echo "::: Did not detect perfectly supported OS but," echo "::: Continuing installation at user's own risk..." From 89a928e7c411e3a1b8e1a7e76f0207ee1efb30ef Mon Sep 17 00:00:00 2001 From: cfcolaco Date: Sun, 8 Oct 2017 20:10:57 +0100 Subject: [PATCH 9/9] fixed (more) Typos and sentences --- auto_install/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 0238527..7d32278 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -61,14 +61,14 @@ dhcpcdFile=/etc/dhcpcd.conf # Next see if we are on a tested and supported OS function noOS_Support() { whiptail --msgbox --backtitle "INVALID OS DETECTED" --title "Invalid OS" "We have not been able to detect a supported OS. -Currently this installer supports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). +Currently this installer supports Raspbian and Debian (Jessie and Stretch), Devuan (Jessie) and Ubuntu from 14.04 (trusty) to 17.04 (zesty). If you think you received this message in error, you can post an issue on the GitHub at https://github.com/pivpn/pivpn/issues." ${r} ${c} exit 1 } function maybeOS_Support() { if (whiptail --backtitle "Not Supported OS" --title "Not Supported OS" --yesno "You are on an OS that we have not tested but MAY work. -Currently this installer supports Raspbian, Debian or Devuan jessie and stretch and Ubuntu from 14.04 (trusty) to 17.04 (zetsy). +Currently this installer supports Raspbian and Debian (Jessie and Stretch), Devuan (Jessie) and Ubuntu from 14.04 (trusty) to 17.04 (zesty). Would you like to continue anyway?" ${r} ${c}) then echo "::: Did not detect perfectly supported OS but," echo "::: Continuing installation at user's own risk..."