Merge pull request #1048 from shelleycat485/master

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

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!"