Merge pull request #1048 from shelleycat485/master

Both wireguard and openvpn can be installed together (Issue #968)

scripts/backup.sh

@@ -2,7 +2,32 @@
 
 backupdir=pivpnbackup
 date=$(date +%Y%m%d-%H%M%S)
-setupVars="/etc/pivpn/setupVars.conf"
+
+# Find the rows and columns. Will default to 80x24 if it can not be detected.
+screen_size=$(stty size 2>/dev/null || echo 24 80)
+rows=$(echo "$screen_size" | awk '{print $1}')
+columns=$(echo "$screen_size" | awk '{print $2}')
+
+# Divide by two so the dialogs take up half of the screen, which looks nice.
+r=$(( rows / 2 ))
+c=$(( columns / 2 ))
+# Unless the screen is tiny
+r=$(( r < 20 ? 20 : r ))
+c=$(( c < 70 ? 70 : c ))
+
+                       chooseVPNCmd=(whiptail --backtitle "Setup PiVPN" --title "Installation mode" --separate-output --radiolist "Choose a VPN configuration to backup (press space to select):" "${r}" "${c}" 2)
+                        VPNChooseOptions=(WireGuard "" on
+                                                                OpenVPN "" off)
+
+                        if VPN=$("${chooseVPNCmd[@]}" "${VPNChooseOptions[@]}" 2>&1 >/dev/tty) ; then
+                                echo "::: Using VPN: $VPN"
+                                VPN="${VPN,,}"
+                        else
+                                echo "::: Cancel selected, exiting...."
+                                exit 1
+                        fi
+
+setupVars="/etc/pivpn/${VPN}/setupVars.conf"
 
 if [ ! -f "${setupVars}" ]; then
     echo "::: Missing setup vars file!"

scripts/openvpn/makeOVPN.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Create OVPN Client
 # Default Variable Declarations
-setupVars="/etc/pivpn/setupVars.conf"
+setupVars="/etc/pivpn/openvpn/setupVars.conf"
 DEFAULT="Default.txt"
 FILEEXT=".ovpn"
 CRT=".crt"

scripts/openvpn/pivpn.sh

@@ -10,26 +10,29 @@ if [[ ! $EUID -eq 0 ]];then
   fi
 fi
 
+scriptDir="/opt/pivpn"
+vpn="openvpn"
+
 function makeOVPNFunc {
     shift
-    $SUDO /opt/pivpn/makeOVPN.sh "$@"
+    $SUDO ${scriptDir}/${vpn}/makeOVPN.sh "$@"
     exit 0
 }
 
 function listClientsFunc {
     shift
-    $SUDO /opt/pivpn/clientStat.sh "$@"
+    $SUDO ${scriptDir}/${vpn}/clientStat.sh "$@"
     exit 0
 }
 
 function listOVPNFunc {
-    $SUDO /opt/pivpn/listOVPN.sh
+    $SUDO ${scriptDir}/${vpn}/listOVPN.sh
     exit 0
 }
 
 function debugFunc {
     echo "::: Generating Debug Output"
-    $SUDO /opt/pivpn/pivpnDebug.sh | tee /tmp/debug.txt
+    $SUDO ${scriptDir}/${vpn}/pivpnDebug.sh | tee /tmp/debug.txt
     echo "::: "
     echo "::: Debug output completed above."
     echo "::: Copy saved to /tmp/debug.txt"
@@ -39,12 +42,12 @@ function debugFunc {
 
 function removeOVPNFunc {
     shift
-    $SUDO /opt/pivpn/removeOVPN.sh "$@"
+    $SUDO ${scriptDir}/${vpn}/removeOVPN.sh "$@"
     exit 0
 }
 
 function uninstallFunc {
-    $SUDO /opt/pivpn/uninstall.sh
+    $SUDO ${scriptDir}/uninstall.sh
     exit 0
 }
 
@@ -55,7 +58,7 @@ function versionFunc {
 function update {
 
     shift
-    $SUDO /opt/pivpn/update.sh "$@"
+    $SUDO ${scriptDir}/update.sh "$@"
     exit 0
 
 
@@ -63,7 +66,7 @@ function update {
 
 function backup {
 
-    $SUDO /opt/pivpn/backup.sh
+    $SUDO ${scriptDir}/backup.sh
     exit 0
 
 }

scripts/openvpn/pivpnDebug.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # This scripts runs as root
 
-setupVars="/etc/pivpn/setupVars.conf"
+setupVars="/etc/pivpn/openvpn/setupVars.conf"
 
 if [ ! -f "${setupVars}" ]; then
     echo "::: Missing setup vars file!"

scripts/openvpn/removeOVPN.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PiVPN: revoke client script
 
-setupVars="/etc/pivpn/setupVars.conf"
+setupVars="/etc/pivpn/openvpn/setupVars.conf"
 INDEX="/etc/openvpn/easy-rsa/pki/index.txt"
 
 if [ ! -f "${setupVars}" ]; then

scripts/pivpn

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Must be root to use this tool
+if [ $EUID -ne 0 ];then
+  	if dpkg-query -s sudo &> /dev/null; then
+        export SUDO="sudo"
+  	else
+    	echo "::: Please install sudo or run this as root."
+    	exit 1
+  fi
+fi
+
+scriptDir="/opt/pivpn"
+vpn="wireguard"
+
+showHelp(){
+    echo "::: To pass off to the pivpn command for each protocol"
+    echo ":::"
+    echo "::: Usage: pivpn wg  <command> [option]"
+    echo "::: Usage: pivpn opv <command> [option]"
+    echo ":::"
+    echo ":::  -h,  help             Show this help dialog"
+    exit 0
+}
+
+if [ $# = 0 ]; then
+    showHelp
+fi
+
+# Handle redirecting to specific functions based on arguments
+case "$1" in
+     wg                      ) "${scriptDir}/wireguard/pivpn.sh" "${@:2}";;
+     opv                     ) "${scriptDir}/openvpn/pivpn.sh"   "${@:2}";;
+"-h"  | "help"               ) showHelp;;
+*                            ) showHelp;;
+esac

scripts/uninstall.sh

@@ -4,19 +4,6 @@
 ### FIXME: global: config storage, refactor all scripts to adhere to the storage
 ### FIXME: use variables where appropriate, reduce magic numbers by 99.9%, at least.
 
-PKG_MANAGER="apt-get"
-UPDATE_PKG_CACHE="${PKG_MANAGER} update"
-dnsmasqConfig="/etc/dnsmasq.d/02-pivpn.conf"
-setupVars="/etc/pivpn/setupVars.conf"
-
-if [ ! -f "${setupVars}" ]; then
-	echo "::: Missing setup vars file!"
-	exit 1
-fi
-
-# shellcheck disable=SC1090
-source "${setupVars}"
-
 # Find the rows and columns. Will default to 80x24 if it can not be detected.
 screen_size=$(stty size 2>/dev/null || echo 24 80)
 rows=$(echo "$screen_size" | awk '{print $1}')
@@ -29,6 +16,39 @@ c=$(( columns / 2 ))
 r=$(( r < 20 ? 20 : r ))
 c=$(( c < 70 ? 70 : c ))
 
+                       chooseVPNCmd=(whiptail --backtitle "Setup PiVPN" --title "Installation mode" --separate-output --radiolist "WireGuard is a new kind of VPN that provides near-instantaneous connection speed, high performance, and modern cryptography.\\n\\nIt's the recommended choice especially if you use mobile devices where WireGuard is easier on battery than OpenVPN.\\n\\nOpenVPN is still available if you need the traditional, flexible, trusted VPN protocol or if you need features like TCP and custom search domain.\\n\\nChoose a VPN to uninstall (press space to select):" "${r}" "${c}" 2)
+                        VPNChooseOptions=(WireGuard "" on
+                                                                OpenVPN "" off)
+
+                        if VPN=$("${chooseVPNCmd[@]}" "${VPNChooseOptions[@]}" 2>&1 >/dev/tty) ; then
+                                echo "::: Using VPN: $VPN"
+                                VPN="${VPN,,}"
+                        else
+                                echo "::: Cancel selected, exiting...."
+                                exit 1
+                        fi
+
+PKG_MANAGER="apt-get"
+UPDATE_PKG_CACHE="${PKG_MANAGER} update"
+dnsmasqConfig="/etc/dnsmasq.d/02-pivpn.conf"
+setupConfigDir="/etc/pivpn"
+setupVarsFile="setupVars.conf"
+setupVars="${setupConfigDir}/${VPN}/${setupVarsFile}"
+
+if [ ! -f "${setupVars}" ]; then
+	echo "::: Missing setup vars file!"
+	exit 1
+fi
+ 
+# shellcheck disable=SC1090
+source "${setupVars}"
+
+if [[ ${VPN} == 'wireguard' ]]; then
+   othervpn='openvpn'
+else
+   othervpn='wireguard'
+fi
+
 ### FIXME: introduce global lib
 spinner(){
 	local pid=$1
@@ -85,9 +105,25 @@ removeAll(){
 
 	fi
 
+        vpnStillExists='no'
+
+        if [ -r "${setupConfigDir}/${othervpn}/${setupVarsFile}" ]; then
+	  vpnStillExists='yes'
+          $SUDO rm -f /usr/local/bin/pivpn
+          $SUDO ln -s -T /opt/pivpn/${othervpn}/pivpn.sh /usr/local/bin/pivpn
+          echo ":::"
+          echo "::: Two VPN protocols exist, you should remove ${othervpn} too"
+          echo ":::"
+        
+        else
+	    rm -f /etc/bash_completion.d/pivpn
+        fi
+
 	# Disable IPv4 forwarding
-	sed -i '/net.ipv4.ip_forward=1/c\#net.ipv4.ip_forward=1' /etc/sysctl.conf
-	sysctl -p
+        if [ ${vpnStillExists} == 'no'  ]; then
+	   sed -i '/net.ipv4.ip_forward=1/c\#net.ipv4.ip_forward=1' /etc/sysctl.conf
+	   sysctl -p
+        fi
 
 	# Purge dependencies
 	echo "::: Purge dependencies..."
@@ -143,22 +179,12 @@ removeAll(){
 	printf "::: Auto cleaning remaining dependencies..."
 	$PKG_MANAGER -y autoclean &> /dev/null & spinner $!; printf "done!\\n";
 
-	echo ":::"
-	# Removing pivpn files
-	echo "::: Removing pivpn system files..."
 
 	if [ -f "$dnsmasqConfig" ]; then
 		rm -f "$dnsmasqConfig"
 		pihole restartdns
 	fi
 
-	rm -rf /opt/pivpn
-	rm -rf /etc/.pivpn
-	rm -rf /etc/pivpn
-	rm -f /var/log/*pivpn*
-	rm -f /usr/local/bin/pivpn
-	rm -f /etc/bash_completion.d/pivpn
-
 	echo ":::"
 	echo "::: Removing VPN configuration files..."
 
@@ -177,6 +203,21 @@ removeAll(){
 		rm -rf "$install_home/ovpns"
 	fi
 
+        if [ ${vpnStillExists} == 'no'  ]; then
+	   echo ":::"
+	   echo "::: Removing pivpn system files..."
+           rm -rf /etc/.pivpn
+	   rm  -rf /etc/pivpn
+	   rm -f /var/log/*pivpn*
+           rm -rf /opt/pivpn
+           rm -f /usr/local/bin/pivpn
+        else
+	   echo ":::"
+	   echo "::: Other protocol still present, so not"
+           echo "::: removing pivpn system files"
+           rm -f "${setupConfigDir}/${VPN}/${setupVarsFile}"
+        fi
+
 	echo ":::"
 	printf "::: Finished removing PiVPN from your system.\\n"
 	printf "::: Reinstall by simpling running\\n:::\\n:::\\tcurl -L https://install.pivpn.io | bash\\n:::\\n::: at any time!\\n:::\\n"

scripts/update.sh

@@ -6,7 +6,32 @@ pivpnrepo="https://github.com/pivpn/pivpn.git"
 pivpnlocalpath="/etc/.pivpn"
 pivpnscripts="/opt/pivpn/"
 bashcompletiondir="/etc/bash_completion.d/"
-setupVars="/etc/pivpn/setupVars.conf"
+
+# Find the rows and columns. Will default to 80x24 if it can not be detected.
+screen_size=$(stty size 2>/dev/null || echo 24 80)
+rows=$(echo "$screen_size" | awk '{print $1}')
+columns=$(echo "$screen_size" | awk '{print $2}')
+
+# Divide by two so the dialogs take up half of the screen, which looks nice.
+r=$(( rows / 2 ))
+c=$(( columns / 2 ))
+# Unless the screen is tiny
+r=$(( r < 20 ? 20 : r ))
+c=$(( c < 70 ? 70 : c ))
+
+                       chooseVPNCmd=(whiptail --backtitle "Setup PiVPN" --title "Installation mode" --separate-output --radiolist "Choose a VPN to update (press space to select):" "${r}" "${c}" 2)
+                        VPNChooseOptions=(WireGuard "" on
+                                                                OpenVPN "" off)
+
+                        if VPN=$("${chooseVPNCmd[@]}" "${VPNChooseOptions[@]}" 2>&1 >/dev/tty) ; then
+                                echo "::: Using VPN: $VPN"
+                                VPN="${VPN,,}"
+                        else
+                                echo "::: Cancel selected, exiting...."
+                                exit 1
+                        fi
+
+setupVars="/etc/pivpn/${VPN}/setupVars.conf"
 
 if [ ! -f "${setupVars}" ]; then
     echo "::: Missing setup vars file!"

scripts/wireguard/bash-completion

@@ -4,8 +4,8 @@ _pivpn()
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
-    dashopts="-a -c -d -l -qr -r -h -u -up -wg -bk"
-    opts="add clients debug list qrcode remove help uninstall update wgupdate backup"
+    dashopts="-a -c -d -l -qr -r -h -u -up -bk"
+    opts="add clients debug list qrcode remove help uninstall update backup"
     if [ "${#COMP_WORDS[@]}" -eq 2 ]
     then
         if [[ ${cur} == -* ]] ; then

scripts/wireguard/makeCONF.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-setupVars="/etc/pivpn/setupVars.conf"
+setupVars="/etc/pivpn/wireguard/setupVars.conf"
 
 if [ ! -f "${setupVars}" ]; then
     echo "::: Missing setup vars file!"

scripts/wireguard/pivpn.sh

@@ -10,53 +10,56 @@ if [ $EUID -ne 0 ];then
   fi
 fi
 
+scriptdir="/opt/pivpn"
+vpn="wireguard"
+
 makeConf(){
     shift
-    $SUDO /opt/pivpn/makeCONF.sh "$@"
+    $SUDO ${scriptdir}/${vpn}/makeCONF.sh "$@"
     exit 0
 }
 
 listConnected(){
     shift
-    $SUDO /opt/pivpn/clientSTAT.sh "$@"
+    $SUDO ${scriptdir}/${vpn}/clientSTAT.sh "$@"
     exit 0
 }
 
 debug(){
-    $SUDO /opt/pivpn/pivpnDEBUG.sh
+    $SUDO ${scriptdir}/${vpn}/pivpnDEBUG.sh
     exit 0
 }
 
 listClients(){
-    $SUDO /opt/pivpn/listCONF.sh
+    $SUDO ${scriptdir}/${vpn}/listCONF.sh
     exit 0
 }
 
 showQrcode(){
     shift
-    $SUDO /opt/pivpn/qrcodeCONF.sh "$@"
+    $SUDO ${scriptdir}/${vpn}/qrcodeCONF.sh "$@"
     exit 0
 }
 
 removeClient(){
     shift
-    $SUDO /opt/pivpn/removeCONF.sh "$@"
+    $SUDO ${scriptdir}/${vpn}/removeCONF.sh "$@"
     exit 0
 }
 
 uninstallServer(){
-    $SUDO /opt/pivpn/uninstall.sh
+    $SUDO ${scriptdir}/uninstall.sh
     exit 0
 }
 
 updateScripts(){
     shift
-    $SUDO /opt/pivpn/update.sh "$@"
+    $SUDO ${scriptdir}/update.sh "$@"
     exit 0
 }
 
 backup(){
-  $SUDO /opt/pivpn/backup.sh
+  $SUDO ${scriptdir}/backup.sh
 }
 
 showHelp(){

scripts/wireguard/pivpnDEBUG.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # This scripts runs as root
 
-setupVars="/etc/pivpn/setupVars.conf"
+setupVars="/etc/pivpn/wireguard/setupVars.conf"
 
 if [ ! -f "${setupVars}" ]; then
     echo "::: Missing setup vars file!"

scripts/wireguard/removeCONF.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-setupVars="/etc/pivpn/setupVars.conf"
+setupVars="/etc/pivpn/wireguard/setupVars.conf"
 
 if [ ! -f "${setupVars}" ]; then
     echo "::: Missing setup vars file!"