From 752d0cc3af851c69a7be2d95e57067e09f288cac Mon Sep 17 00:00:00 2001
From: Kaladin Light <0.kaladin@gmail.com>
Date: Sun, 5 Feb 2017 14:30:31 -0500
Subject: [PATCH 01/16] Leave the loop once we match

---
 scripts/makeOVPN.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/makeOVPN.sh b/scripts/makeOVPN.sh
index 72e5fb8..db15efe 100644
--- a/scripts/makeOVPN.sh
+++ b/scripts/makeOVPN.sh
@@ -86,10 +86,11 @@ fi
 while read -r line || [ -n "${line}" ]; do
     STATUS=$(echo "$line" | awk '{print $1}')
 
-    if [[ "${STATUS}" = "V" ]]; then
+    if [ "${STATUS}" == "V" ]; then
         CERT=$(echo "$line" | sed -e 's:.*/CN=::')
         if [ "${CERT}" == "${NAME}" ]; then
             INUSE="1"
+            break
         fi
     fi
 done <${INDEX}

From 6ce39bfec399d9a8203409a108ef27f2ee29327a Mon Sep 17 00:00:00 2001
From: 0-kaladin <0.kaladin@gmail.com>
Date: Mon, 27 Feb 2017 21:01:23 -0500
Subject: [PATCH 02/16] Update README for IRC channel

Due to discontinuation of Google Spaces
---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c181412..d290393 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,9 @@ welcome any feedback on your experience. If you have problems using it, feel
 free to post an issue here on github.  I'll classify the issues the best I can
 to keep things sorted.
 
-You can also post on the [Google Space](https://goo.gl/spaces/kgp2Mcy5RDfZ5SSf8) I created for PiVPN, especially suited for general questions or discussions.
+[[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 <ircs://freenode/pivpn> on freenode in IRC for community support or general questions. 
 
 Contributions
 -------------

From 5db23185fd8d5e50aea6ca86f4116159771c6a0d Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Mon, 13 Mar 2017 17:00:28 +1300
Subject: [PATCH 03/16] Added pi-hole's undocumented flags

UNTESTED!
---
 auto_install/install.sh | 425 ++++++++++++++++++++++++++++------------
 1 file changed, 304 insertions(+), 121 deletions(-)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index 85575c4..ebf6bfb 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -10,11 +10,13 @@
 # curl -L https://install.pivpn.io | bash
 # Make sure you have `curl` installed
 
-
+set -e
 ######## VARIABLES #########
 
 tmpLog="/tmp/pivpn-install.log"
 instalLogLoc="/etc/pivpn/install.log"
+setupVars=/etc/pivpn/setupVars.conf
+useUpdateVars=false
 
 ### PKG Vars ###
 PKG_MANAGER="apt-get"
@@ -42,6 +44,11 @@ c=$(( columns / 2 ))
 r=$(( r < 20 ? 20 : r ))
 c=$(( c < 70 ? 70 : c ))
 
+######## Undocumented Flags. Shhh ########
+skipSpaceCheck=false
+reconfigure=false
+runUnattended=false
+
 # Find IP used to route to outside world
 
 IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
@@ -51,24 +58,6 @@ IPv4gw=$(ip route get 8.8.8.8 | awk '{print $3}')
 availableInterfaces=$(ip -o link | grep "state UP" | awk '{print $2}' | cut -d':' -f1 | cut -d'@' -f1)
 dhcpcdFile=/etc/dhcpcd.conf
 
-######## FIRST CHECK ########
-# Must be root to install
-echo ":::"
-if [[ $EUID -eq 0 ]];then
-    echo "::: You are root."
-else
-    echo "::: sudo will be used for the install."
-    # Check if it is actually installed
-    # If it isn't, exit because the install cannot complete
-    if [[ $(dpkg-query -s sudo) ]];then
-        export SUDO="sudo"
-        export SUDOE="sudo -E"
-    else
-        echo "::: Please install sudo or run this as root."
-        exit 1
-    fi
-fi
-
 # 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.
@@ -79,44 +68,47 @@ 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 supports Raspbian 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..."
-            else
-                echo "::: Exiting due to unsupported OS"
-                exit 1
-            fi
+Currently this installer supports Raspbian 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..."
+    else
+        echo "::: Exiting due to unsupported OS"
+        exit 1
+    fi
 }
 
-# if lsb_release command is on their system
-if hash lsb_release 2>/dev/null; then
-    PLAT=$(lsb_release -si)
-    OSCN=$(lsb_release -sc) # We want this to be trusty xenial or jessie
-
-    if [[ $PLAT == "Ubuntu" || $PLAT == "Raspbian" || $PLAT == "Debian" ]]; then
-        if [[ $OSCN != "trusty" && $OSCN != "xenial" && $OSCN != "jessie" ]]; then
-            maybeOS_Support
-        fi
-    else
-        noOS_Support
-    fi
-# else get info from os-release
-elif grep -q debian /etc/os-release; then
-    if grep -q jessie /etc/os-release; then
-        PLAT="Raspbian"
-        OSCN="jessie"
-    else
-        PLAT="Ubuntu"
-        OSCN="unknown"
-        maybeOS_Support
-    fi
-# else we prob don't want to install
-else
-    noOS_Support
-fi
-
-echo "${PLAT}" > /tmp/DET_PLATFORM
+# Compatibility
+distro_check() {
+  # if lsb_release command is on their system
+  if hash lsb_release 2>/dev/null; then
+      PLAT=$(lsb_release -si)
+      OSCN=$(lsb_release -sc) # We want this to be trusty xenial or jessie
+  
+      if [[ $PLAT == "Ubuntu" || $PLAT == "Raspbian" || $PLAT == "Debian" ]]; then
+          if [[ $OSCN != "trusty" && $OSCN != "xenial" && $OSCN != "jessie" ]]; then
+              maybeOS_Support
+          fi
+      else
+          noOS_Support
+      fi
+  # else get info from os-release
+  elif grep -q debian /etc/os-release; then
+      if grep -q jessie /etc/os-release; then
+          PLAT="Raspbian"
+          OSCN="jessie"
+      else
+          PLAT="Ubuntu"
+          OSCN="unknown"
+          maybeOS_Support
+      fi
+  # else we prob don't want to install
+  else
+      noOS_Support
+  fi
+  
+  echo "${PLAT}" > /tmp/DET_PLATFORM
+}
 
 ####### FUNCTIONS ##########
 spinner()
@@ -280,6 +272,7 @@ If you are in Amazon then you can not configure a static IP anyway. Just ensure
 }
 
 getStaticIPv4Settings() {
+    local ipSettingsCorrect
     # Grab their current DNS Server
     IPv4dns=$(nslookup 127.0.0.1 | grep Server: | awk '{print $2}')
     # Ask if the user wants to use DHCP settings as their static IP
@@ -347,7 +340,6 @@ setStaticIPv4() {
     if [[ -f /etc/dhcpcd.conf ]]; then
         if grep -q "${IPv4addr}" ${dhcpcdFile}; then
             echo "::: Static IP already configured."
-            :
         else
             setDHCPCD
             $SUDO ip addr replace dev "${pivpnInterface}" "${IPv4addr}"
@@ -604,17 +596,21 @@ make_repo() {
 }
 
 update_repo() {
-    # Pull the latest commits
-    echo -n ":::     Updating repo in $1..."
-    cd "${1}" || exit 1
-    $SUDO git stash -q > /dev/null & spinner $!
-    $SUDO git pull -q > /dev/null & spinner $!
-    if [ -z "${TESTING+x}" ]; then
-        :
+    if [[ "${reconfigure}" == true ]]; then
+          echo "::: --reconfigure passed to install script. Not downloading/updating local repos"
     else
-        ${SUDOE} git checkout test
+        # Pull the latest commits
+        echo -n ":::     Updating repo in $1..."
+        cd "${1}" || exit 1
+        $SUDO git stash -q > /dev/null & spinner $!
+        $SUDO git pull -q > /dev/null & spinner $!
+        if [ -z "${TESTING+x}" ]; then
+            :
+        else
+            ${SUDOE} git checkout test
+        fi
+        echo " done!"
     fi
-    echo " done!"
 }
 
 setCustomProto() {
@@ -816,7 +812,7 @@ set_var EASYRSA_ALGO       rsa
 set_var EASYRSA_CURVE      secp384r1
 EOF
 
-echo "${String}" | $SUDO tee /etc/openvpn/easy-rsa/vars >/dev/null
+    echo "${String}" | $SUDO tee /etc/openvpn/easy-rsa/vars >/dev/null
 
     # Edit the KEY_SIZE variable in the vars file to set user chosen key size
     cd /etc/openvpn/easy-rsa || exit
@@ -836,15 +832,15 @@ echo "${String}" | $SUDO tee /etc/openvpn/easy-rsa/vars >/dev/null
     ${SUDOE} ./easyrsa build-server-full server nopass
 
     if ([ "$ENCRYPT" -ge "4096" ] && whiptail --backtitle "Setup OpenVPN" --title "Download Diffie-Hellman Parameters" --yesno --defaultno "Download Diffie-Hellman parameters from a public DH parameter generation service?\n\nGenerating DH parameters for a $ENCRYPT-bit key can take many hours on a Raspberry Pi. You can instead download DH parameters from \"2 Ton Digital\" that are generated at regular intervals as part of a public service. Downloaded DH parameters will be randomly selected from a pool of the last 128 generated.\nMore information about this service can be found here: https://2ton.com.au/dhtool/\n\nIf you're paranoid, choose 'No' and Diffie-Hellman parameters will be generated on your device." ${r} ${c})
-then
-    # Downloading parameters
-    RANDOM_INDEX=$(( RANDOM % 128 ))
-    ${SUDOE} curl "https://2ton.com.au/dhparam/${ENCRYPT}/${RANDOM_INDEX}" -o "/etc/openvpn/easy-rsa/pki/dh${ENCRYPT}.pem"
-else
-    # Generate Diffie-Hellman key exchange
-    ${SUDOE} ./easyrsa gen-dh
-    ${SUDOE} mv pki/dh.pem pki/dh${ENCRYPT}.pem
-fi
+    then
+        # Downloading parameters
+        RANDOM_INDEX=$(( RANDOM % 128 ))
+        ${SUDOE} curl "https://2ton.com.au/dhparam/${ENCRYPT}/${RANDOM_INDEX}" -o "/etc/openvpn/easy-rsa/pki/dh${ENCRYPT}.pem"
+    else
+        # Generate Diffie-Hellman key exchange
+        ${SUDOE} ./easyrsa gen-dh
+        ${SUDOE} mv pki/dh.pem pki/dh${ENCRYPT}.pem
+    fi
 
     # Generate static HMAC key to defend against DDoS
     ${SUDOE} openvpn --genkey --secret pki/ta.key
@@ -1007,11 +1003,41 @@ confOVPN() {
     $SUDO chmod 0777 -R "/home/$pivpnUser/ovpns"
 }
 
+finalExports() {
+    # Update variables in setupVars.conf file
+    if [ -e "${setupVars}" ]; then
+        sed -i.update.bak '/pivpnInterface/d;/IPv4dns/d;/IPv4addr/d;/IPv4gw/d;/pivpnUser/d;/UNATTUPG/d;' "${setupVars}"
+    fi
+    {
+        echo "pivpnInterface=${pivpnInterface}"
+        echo "IPv4dns=${IPv4dns}"
+        echo "IPv4addr=${IPv4addr}"
+        echo "IPv4gw=${IPv4gw}"
+        echo "pivpnUser=${pivpnUser}"
+        echo "UNATTUPG=${UNATTUPG}"
+    }>> "${setupVars}"
+}
+
+
+# I suggest replacing these names.
+
+#accountForRefactor() {
+#    # At some point in the future this list can be pruned, for now we'll need it to ensure updates don't break.
+#
+#    # Refactoring of install script has changed the name of a couple of variables. Sort them out here.
+#    sed -i 's/pivpnInterface/PIVPN_INTERFACE/g' ${setupVars}
+#    sed -i 's/IPv4dns/IPV4_DNS/g' ${setupVars}
+#    sed -i 's/IPv4addr/IPV4_ADDRESS/g' ${setupVars}
+#    sed -i 's/IPv4gw/IPV4_GATEWAY/g' ${setupVars}
+#    sed -i 's/pivpnUser/PIVPN_USER/g' ${setupVars}
+#    sed -i 's/IPv4dns/IPV4_DNS/g' ${setupVars}
+#    #sed -i 's/UNATTUPG/UNATTUPG/g' ${setupVars}
+#}
+
 installPiVPN() {
     stopServices
-    confUnattendedUpgrades
     $SUDO mkdir -p /etc/pivpn/
-    getGitFiles ${pivpnFilesDir} ${pivpnGitUrl}
+    confUnattendedUpgrades
     installScripts
     setCustomProto
     setCustomPort
@@ -1019,17 +1045,26 @@ installPiVPN() {
     confNetwork
     confOVPN
     setClientDNS
+    finalExports
 }
 
+updatePiVPN() { # Could be replaced by installPiVPN, but keep structure close to pi-hole
+    #accountForRefactor
+    stopServices
+    confUnattendedUpgrades
+    installScripts
+    setCustomProto
+    setCustomPort
+    confOpenVPN
+    confNetwork
+    confOVPN
+    setClientDNS
+    finalExports #re-export setupVars.conf to account for any new vars added in new versions
+}
+
+
 displayFinalMessage() {
     # Final completion message to user
-    if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then
-        $SUDO service openvpn start
-    else
-        $SUDO systemctl enable openvpn.service
-        $SUDO systemctl start openvpn.service
-    fi
-
     whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Now run 'pivpn add' to create the ovpn profiles.
 Run 'pivpn help' to see what else you can do!
 The install log is in /etc/pivpn." ${r} ${c}
@@ -1041,46 +1076,194 @@ The install log is in /etc/pivpn." ${r} ${c}
     fi
 }
 
+update_dialogs() {
+    # reconfigure
+    if [ "${reconfigure}" = true ]; then
+        opt1a="Repair"
+        opt1b="This will retain existing settings"
+        strAdd="You will remain on the same version"
+    else
+        opt1a="Update"
+        opt1b="This will retain existing settings."
+        strAdd="You will be updated to the latest version."
+    fi
+    opt2a="Reconfigure"
+    opt2b="This will allow you to enter new settings"
+    
+    UpdateCmd=$(whiptail --title "Existing Install Detected!" --menu "\n\nWe have detected an existing install.\n\nPlease choose from the following options: \n($strAdd)" ${r} ${c} 2 \
+    "${opt1a}"  "${opt1b}" \
+    "${opt2a}"  "${opt2b}" 3>&2 2>&1 1>&3) || \
+    { echo "::: Cancel selected. Exiting"; exit 1; }
+    
+    case ${UpdateCmd} in
+        ${opt1a})
+            echo "::: ${opt1a} option selected."
+            useUpdateVars=true
+            ;;
+        ${opt2a})
+            echo "::: ${opt2a} option selected"
+            useUpdateVars=false
+            ;;
+    esac
+}
+
+clone_or_update_repos() {
+    if [[ "${reconfigure}" == true ]]; then
+        echo "::: --reconfigure passed to install script. Not downloading/updating local repos"
+    else
+        # Get Git files
+        getGitFiles ${pivpnFilesDir} ${pivpnGitUrl} || \
+        { echo "!!! Unable to clone ${pivpnGitUrl} into ${pivpnFilesDir}, unable to continue."; \
+            exit 1; \
+        }
+    fi
+}
+
 ######## SCRIPT ############
-# Verify there is enough disk space for the install
-verifyFreeDiskSpace
 
-# Install the packages (we do this first because we need whiptail)
-#checkForDependencies
-update_package_cache
+main() {
 
-notify_package_updates_available
+    ######## FIRST CHECK ########
+    # Must be root to install
+    echo ":::"
+    if [[ $EUID -eq 0 ]];then
+        echo "::: You are root."
+    else
+        echo "::: sudo will be used for the install."
+        # Check if it is actually installed
+        # If it isn't, exit because the install cannot complete
+        if [[ $(dpkg-query -s sudo) ]];then
+            export SUDO="sudo"
+            export SUDOE="sudo -E"
+        else
+            echo "::: Please install sudo or run this as root."
+            exit 1
+        fi
+    fi
+    
+    # Check for supported distribution
+    distro_check
 
-install_dependent_packages PIVPN_DEPS[@]
+    # Check arguments for the undocumented flags
+    for var in "$@"; do
+        case "$var" in
+            "--reconfigure"  ) reconfigure=true;;
+            "--i_do_not_follow_recommendations"   ) skipSpaceCheck=false;;
+            "--unattended"     ) runUnattended=true;;
+        esac
+    done
+    
+    if [[ -f ${setupVars} ]]; then
+        if [[ "${runUnattended}" == true ]]; then
+            echo "::: --unattended passed to install script, no whiptail dialogs will be displayed"
+            useUpdateVars=true
+        else
+            update_dialogs
+        fi
+    fi
+  
+    # Start the installer
+    # Verify there is enough disk space for the install
+    if [[ "${skipSpaceCheck}" == true ]]; then
+        echo "::: --i_do_not_follow_recommendations passed to script, skipping free disk space verification!"
+    else
+        verifyFreeDiskSpace
+    fi
+    
+    # Install the packages (we do this first because we need whiptail)
+    #checkForDependencies
+    update_package_cache
+    
+    # Notify user of package availability
+    notify_package_updates_available
+    
+    # Install packages used by this installation script
+    install_dependent_packages PIVPN_DEPS[@]
+    
+    if [[ ${useUpdateVars} == false ]]; then
+        # Display welcome dialogs
+        welcomeDialogs
+        
+        # Find interfaces and let the user choose one
+        chooseInterface
+        
+        # Only try to set static on Raspbian, otherwise let user do it
+        if [[ $PLAT != "Raspbian" ]]; then
+            avoidStaticIPv4Ubuntu
+        else
+            getStaticIPv4Settings
+            setStaticIPv4
+        fi
+        
+        # Set the Network IP and Mask correctly
+        setNetwork
+        
+        # Choose the user for the ovpns
+        chooseUser
+        
+        # Ask if unattended-upgrades will be enabled
+        unattendedUpgrades
+        
+        # Clone/Update the repos
+        clone_or_update_repos
+        
+        # Install and log everything to a file
+        installPiVPN | tee ${tmpLog}
+        
+        echo "::: Install Complete..."
+    else
+        # Only try to set static on Raspbian
+        if [[ $PLAT != "Raspbian" ]]; then
+            echo "::: IP Information"
+            echo "::: Since we think you are not using Raspbian, we will not configure a static IP for you."
+            echo "::: If you are in Amazon then you can not configure a static IP anyway."
+            echo "::: Just ensure before this installer started you had set an elastic IP on your instance."
+        else
+            setStaticIPv4 # This might be a problem if a user tries to modify the ip in the config file and then runs an update because of the way we check for previous configuration in /etc/dhcpcd.conf
+        fi
+        
+        # Clone/Update the repos
+        clone_or_update_repos
+        
+        # Source ${setupVars} for use in the rest of the functions.
+        source ${setupVars}
+        
+        
+        updatePiVPN | tee ${tmpLog}
+    fi
+        
+    #Move the install log into /etc/pivpn for storage
+    $SUDO mv ${tmpLog} ${instalLogLoc}
+    
+    echo "::: Restarting services..."
+    # Start services
+    if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then
+        $SUDO service openvpn start
+    else
+        $SUDO systemctl enable openvpn.service
+        $SUDO systemctl start openvpn.service
+    fi
+    
+    echo "::: done."
+    
+    if [[ "${useUpdateVars}" == false ]]; then
+        displayFinalMessage
+    fi
+    
+    echo ":::"
+    if [[ "${useUpdateVars}" == false ]]; then
+        echo "::: Installation Complete!"
+        echo "::: Now run 'pivpn add' to create the ovpn profiles."
+        echo "::: Run 'pivpn help' to see what else you can do!"
+        echo "::: It is strongly recommended you reboot after installation."
+    else
+        echo "::: Update complete!"
+    fi
+    
+    echo ":::"
+    echo "::: The install log is located at: ${instalLogLoc}"
+}
 
-# Start the installer
-welcomeDialogs
-
-# Find interfaces and let the user choose one
-chooseInterface
-
-# Only try to set static on Raspbian, otherwise let user do it
-if [[ $PLAT != "Raspbian" ]]; then
-    avoidStaticIPv4Ubuntu
-else
-    getStaticIPv4Settings
-    setStaticIPv4
+if [[ "${PVPN_TEST}" != true ]] ; then
+  main "$@"
 fi
-
-setNetwork
-
-# Choose the user for the ovpns
-chooseUser
-
-# Ask if unattended-upgrades will be enabled
-unattendedUpgrades
-
-# Install
-installPiVPN | tee ${tmpLog}
-
-#Move the install log into /etc/pivpn for storage
-$SUDO mv ${tmpLog} ${instalLogLoc}
-
-displayFinalMessage
-
-echo "::: Install Complete..."

From 71021d6ffa5f4c068999f576077e650e929081ec Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Mon, 13 Mar 2017 19:44:29 +1300
Subject: [PATCH 04/16] Added all parameters, initial testing done

---
 auto_install/install.sh | 165 +++++++++++++++++++++++++---------------
 1 file changed, 104 insertions(+), 61 deletions(-)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index ebf6bfb..dfe775c 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -480,7 +480,6 @@ unattendedUpgrades() {
 
     if (whiptail --backtitle "Security Updates" --title "Unattended Upgrades" --yesno "Do you want to enable unattended upgrades of security patches to this server?" ${r} ${c}) then
         UNATTUPG="unattended-upgrades"
-        $SUDO apt-get --yes --quiet --no-install-recommends install "$UNATTUPG" > /dev/null & spinner $!
     else
         UNATTUPG=""
     fi
@@ -772,20 +771,19 @@ setClientDNS() {
 }
 
 confOpenVPN() {
-    # Ask user if want to modify default port
-    SERVER_NAME="server"
-
-    # Ask user for desired level of encryption
-    ENCRYPT=$(whiptail --backtitle "Setup OpenVPN" --title "Encryption Strength" --radiolist \
-    "Choose your desired level of encryption:\n   This is an encryption key that will be generated on your system.  The larger the key, the more time this will take.  For most applications it is recommended to use 2048 bit.  If you are testing or just want to get through it quicker you can use 1024.  If you are paranoid about ... things... then grab a cup of joe and pick 4096." ${r} ${c} 3 \
-    "2048" "Use 2048-bit encryption. Recommended level." ON \
-    "1024" "Use 1024-bit encryption. Test level." OFF \
-    "4096" "Use 4096-bit encryption. Paranoid level." OFF 3>&1 1>&2 2>&3)
-
-    exitstatus=$?
-    if [ $exitstatus != 0 ]; then
-        echo "::: Cancel selected. Exiting..."
-        exit 1
+    if [[ ${useUpdateVars} == false ]]; then
+        # Ask user for desired level of encryption
+        ENCRYPT=$(whiptail --backtitle "Setup OpenVPN" --title "Encryption Strength" --radiolist \
+        "Choose your desired level of encryption:\n   This is an encryption key that will be generated on your system.  The larger the key, the more time this will take.  For most applications it is recommended to use 2048 bit.  If you are testing or just want to get through it quicker you can use 1024.  If you are paranoid about ... things... then grab a cup of joe and pick 4096." ${r} ${c} 3 \
+        "2048" "Use 2048-bit encryption. Recommended level." ON \
+        "1024" "Use 1024-bit encryption. Test level." OFF \
+        "4096" "Use 4096-bit encryption. Paranoid level." OFF 3>&1 1>&2 2>&3)
+        
+        exitstatus=$?
+        if [ $exitstatus != 0 ]; then
+            echo "::: Cancel selected. Exiting..."
+            exit 1
+        fi
     fi
 
     # If easy-rsa exists, remove it
@@ -826,12 +824,23 @@ EOF
     ${SUDOE} ./easyrsa --batch build-ca nopass
     printf "\n::: CA Complete.\n"
 
-    whiptail --msgbox --backtitle "Setup OpenVPN" --title "Server Information" "The server key, Diffie-Hellman key, and HMAC key will now be generated." ${r} ${c}
-
+    if [[ ${useUpdateVars} == false ]]; then
+        whiptail --msgbox --backtitle "Setup OpenVPN" --title "Server Information" "The server key, Diffie-Hellman key, and HMAC key will now be generated." ${r} ${c}
+    fi
+    
     # Build the server
     ${SUDOE} ./easyrsa build-server-full server nopass
 
-    if ([ "$ENCRYPT" -ge "4096" ] && whiptail --backtitle "Setup OpenVPN" --title "Download Diffie-Hellman Parameters" --yesno --defaultno "Download Diffie-Hellman parameters from a public DH parameter generation service?\n\nGenerating DH parameters for a $ENCRYPT-bit key can take many hours on a Raspberry Pi. You can instead download DH parameters from \"2 Ton Digital\" that are generated at regular intervals as part of a public service. Downloaded DH parameters will be randomly selected from a pool of the last 128 generated.\nMore information about this service can be found here: https://2ton.com.au/dhtool/\n\nIf you're paranoid, choose 'No' and Diffie-Hellman parameters will be generated on your device." ${r} ${c})
+    if [[ ${useUpdateVars} == false ]]; then
+        if ([ "$ENCRYPT" -ge "4096" ] && whiptail --backtitle "Setup OpenVPN" --title "Download Diffie-Hellman Parameters" --yesno --defaultno "Download Diffie-Hellman parameters from a public DH parameter generation service?\n\nGenerating DH parameters for a $ENCRYPT-bit key can take many hours on a Raspberry Pi. You can instead download DH parameters from \"2 Ton Digital\" that are generated at regular intervals as part of a public service. Downloaded DH parameters will be randomly selected from a pool of the last 128 generated.\nMore information about this service can be found here: https://2ton.com.au/dhtool/\n\nIf you're paranoid, choose 'No' and Diffie-Hellman parameters will be generated on your device." ${r} ${c})
+        then
+            DOWNLOAD_DH_PARAM=true
+        else
+            DOWNLOAD_DH_PARAM=false
+        fi
+    fi
+    
+    if [ "$ENCRYPT" -ge "4096" ] && [[ ${DOWNLOAD_DH_PARAM} == true ]]
     then
         # Downloading parameters
         RANDOM_INDEX=$(( RANDOM % 128 ))
@@ -871,6 +880,7 @@ EOF
 
 confUnattendedUpgrades() {
     if [[ $UNATTUPG == "unattended-upgrades" ]]; then
+        $SUDO apt-get --yes --quiet --no-install-recommends install "$UNATTUPG" > /dev/null & spinner $!
         if [[ $PLAT == "Ubuntu" ]]; then
             # Ubuntu 50unattended-upgrades should already just have security enabled
             # so we just need to configure the 10periodic file
@@ -953,37 +963,40 @@ confOVPN() {
     echo 0 > /tmp/REVOKE_STATUS
     $SUDO cp /tmp/REVOKE_STATUS /etc/pivpn/REVOKE_STATUS
 
-    METH=$(whiptail --title "Public IP or DNS" --radiolist "Will clients use a Public IP or DNS Name to connect to your server?" ${r} ${c} 2 \
-    "$IPv4pub" "Use this public IP" "ON" \
-    "DNS Entry" "Use a public DNS" "OFF" 3>&1 1>&2 2>&3)
-
-    exitstatus=$?
-    if [ $exitstatus != 0 ]; then
-        echo "::: Cancel selected. Exiting..."
-        exit 1
-    fi
-
     $SUDO cp /etc/.pivpn/Default.txt /etc/openvpn/easy-rsa/pki/Default.txt
 
-    if [ "$METH" == "$IPv4pub" ]; then
-        $SUDO sed -i 's/IPv4pub/'"$IPv4pub"'/' /etc/openvpn/easy-rsa/pki/Default.txt
-    else
-        until [[ $publicDNSCorrect = True ]]
-        do
-            PUBLICDNS=$(whiptail --title "PiVPN Setup" --inputbox "What is the public DNS name of this Server?" ${r} ${c} 3>&1 1>&2 2>&3)
-            exitstatus=$?
-            if [ $exitstatus != 0 ]; then
+    if [[ ${useUpdateVars} == false ]]; then
+        METH=$(whiptail --title "Public IP or DNS" --radiolist "Will clients use a Public IP or DNS Name to connect to your server?" ${r} ${c} 2 \
+        "$IPv4pub" "Use this public IP" "ON" \
+        "DNS Entry" "Use a public DNS" "OFF" 3>&1 1>&2 2>&3)
+    
+        exitstatus=$?
+        if [ $exitstatus != 0 ]; then
             echo "::: Cancel selected. Exiting..."
             exit 1
-            fi
-            if (whiptail --backtitle "Confirm DNS Name" --title "Confirm DNS Name" --yesno "Is this correct?\n\n Public DNS Name:  $PUBLICDNS" ${r} ${c}) then
-                publicDNSCorrect=True
-                $SUDO sed -i 's/IPv4pub/'"$PUBLICDNS"'/' /etc/openvpn/easy-rsa/pki/Default.txt
-            else
-                publicDNSCorrect=False
-
-            fi
-        done
+        fi
+    
+        if [ "$METH" == "$IPv4pub" ]; then
+            $SUDO sed -i 's/IPv4pub/'"$IPv4pub"'/' /etc/openvpn/easy-rsa/pki/Default.txt
+        else
+            until [[ $publicDNSCorrect = True ]]
+            do
+                PUBLICDNS=$(whiptail --title "PiVPN Setup" --inputbox "What is the public DNS name of this Server?" ${r} ${c} 3>&1 1>&2 2>&3)
+                exitstatus=$?
+                if [ $exitstatus != 0 ]; then
+                echo "::: Cancel selected. Exiting..."
+                exit 1
+                fi
+                if (whiptail --backtitle "Confirm DNS Name" --title "Confirm DNS Name" --yesno "Is this correct?\n\n Public DNS Name:  $PUBLICDNS" ${r} ${c}) then
+                    publicDNSCorrect=True
+                    $SUDO sed -i 's/IPv4pub/'"$PUBLICDNS"'/' /etc/openvpn/easy-rsa/pki/Default.txt
+                else
+                    publicDNSCorrect=False
+                fi
+            done
+        fi
+    else
+        $SUDO sed -i 's/IPv4pub/'"$PUBLICDNS"'/' /etc/openvpn/easy-rsa/pki/Default.txt
     fi
 
     # if they modified port put value in Default.txt for clients to use
@@ -1006,32 +1019,47 @@ confOVPN() {
 finalExports() {
     # Update variables in setupVars.conf file
     if [ -e "${setupVars}" ]; then
-        sed -i.update.bak '/pivpnInterface/d;/IPv4dns/d;/IPv4addr/d;/IPv4gw/d;/pivpnUser/d;/UNATTUPG/d;' "${setupVars}"
+        sed -i.update.bak '/pivpnUser/d;/UNATTUPG/d;/pivpnInterface/d;/IPv4dns/d;/IPv4addr/d;/IPv4gw/d;/pivpnProto/d;/PORT/d;/ENCRYPT/d;/DOWNLOAD_DH_PARAM/d;/PUBLICDNS/d;OVPNDNS1/d;OVPNDNS2/d;SERVER_NAME/d;' "${setupVars}"
     fi
     {
+        echo "pivpnUser=${pivpnUser}"
+        echo "UNATTUPG=${UNATTUPG}"
         echo "pivpnInterface=${pivpnInterface}"
         echo "IPv4dns=${IPv4dns}"
         echo "IPv4addr=${IPv4addr}"
         echo "IPv4gw=${IPv4gw}"
-        echo "pivpnUser=${pivpnUser}"
-        echo "UNATTUPG=${UNATTUPG}"
+        echo "pivpnProto=${pivpnProto}"
+        echo "PORT=${PORT}"
+        echo "ENCRYPT=${ENCRYPT}"
+        echo "DOWNLOAD_DH_PARAM=${DOWNLOAD_DH_PARAM}"
+        echo "PUBLICDNS=${PUBLICDNS}"
+        echo "OVPNDNS1=${OVPNDNS1}"
+        echo "OVPNDNS2=${OVPNDNS2}"
+        echo "SERVER_NAME=${SERVER_NAME}"
     }>> "${setupVars}"
 }
 
 
-# I suggest replacing these names.
+# I suggest replacing some of these names.
 
 #accountForRefactor() {
 #    # At some point in the future this list can be pruned, for now we'll need it to ensure updates don't break.
 #
 #    # Refactoring of install script has changed the name of a couple of variables. Sort them out here.
+#    sed -i 's/pivpnUser/PIVPN_USER/g' ${setupVars}
+#    #sed -i 's/UNATTUPG/UNATTUPG/g' ${setupVars}
 #    sed -i 's/pivpnInterface/PIVPN_INTERFACE/g' ${setupVars}
 #    sed -i 's/IPv4dns/IPV4_DNS/g' ${setupVars}
 #    sed -i 's/IPv4addr/IPV4_ADDRESS/g' ${setupVars}
 #    sed -i 's/IPv4gw/IPV4_GATEWAY/g' ${setupVars}
-#    sed -i 's/pivpnUser/PIVPN_USER/g' ${setupVars}
-#    sed -i 's/IPv4dns/IPV4_DNS/g' ${setupVars}
-#    #sed -i 's/UNATTUPG/UNATTUPG/g' ${setupVars}
+#    sed -i 's/pivpnProto/TRANSPORT_LAYER/g' ${setupVars}
+#    #sed -i 's/PORT/PORT/g' ${setupVars}
+#    #sed -i 's/ENCRYPT/ENCRYPT/g' ${setupVars}
+#    #sed -i 's/DOWNLOAD_DH_PARAM/DOWNLOAD_DH_PARAM/g' ${setupVars}
+#    #sed -i 's/PUBLICDNS/PUBLICDNS/g' ${setupVars}
+#    #sed -i 's/OVPNDNS1/OVPNDNS1/g' ${setupVars}
+#    #sed -i 's/OVPNDNS2/OVPNDNS2/g' ${setupVars}
+#    #sed -i 's/SERVER_NAME/SERVER_NAME/g' ${setupVars}
 #}
 
 installPiVPN() {
@@ -1043,22 +1071,37 @@ installPiVPN() {
     setCustomPort
     confOpenVPN
     confNetwork
+    SERVER_NAME="server"
     confOVPN
     setClientDNS
     finalExports
 }
 
-updatePiVPN() { # Could be replaced by installPiVPN, but keep structure close to pi-hole
+updatePiVPN() {
     #accountForRefactor
     stopServices
     confUnattendedUpgrades
     installScripts
-    setCustomProto
-    setCustomPort
+    
+    # setCustomProto
+    echo "${pivpnProto}" > /tmp/pivpnPROTO
+    # write out the PROTO
+    PROTO=$pivpnProto
+    $SUDO cp /tmp/pivpnPROTO /etc/pivpn/INSTALL_PROTO
+    
+    #setCustomPort
+    # write out the port
+    echo ${PORT} > /tmp/INSTALL_PORT
+    $SUDO cp /tmp/INSTALL_PORT /etc/pivpn/INSTALL_PORT
+    
     confOpenVPN
     confNetwork
     confOVPN
-    setClientDNS
+    
+	# ?? Is this always OK? Also if you only select one DNS server ??
+    $SUDO sed -i '0,/\(dhcp-option DNS \)/ s/\(dhcp-option DNS \).*/\1'${OVPNDNS1}'\"/' /etc/openvpn/server.conf
+    $SUDO sed -i '0,/\(dhcp-option DNS \)/! s/\(dhcp-option DNS \).*/\1'${OVPNDNS2}'\"/' /etc/openvpn/server.conf
+
     finalExports #re-export setupVars.conf to account for any new vars added in new versions
 }
 
@@ -1143,7 +1186,7 @@ main() {
     
     # Check for supported distribution
     distro_check
-
+    
     # Check arguments for the undocumented flags
     for var in "$@"; do
         case "$var" in
@@ -1212,6 +1255,9 @@ main() {
         
         echo "::: Install Complete..."
     else
+        # Source ${setupVars} for use in the rest of the functions.
+        source ${setupVars}
+        
         # Only try to set static on Raspbian
         if [[ $PLAT != "Raspbian" ]]; then
             echo "::: IP Information"
@@ -1225,13 +1271,10 @@ main() {
         # Clone/Update the repos
         clone_or_update_repos
         
-        # Source ${setupVars} for use in the rest of the functions.
-        source ${setupVars}
-        
         
         updatePiVPN | tee ${tmpLog}
     fi
-        
+    
     #Move the install log into /etc/pivpn for storage
     $SUDO mv ${tmpLog} ${instalLogLoc}
     

From 2a639e753e49a7faac3bc6cf5a4d38c6c8842df3 Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Tue, 14 Mar 2017 10:48:16 +1300
Subject: [PATCH 05/16] Fixed sed command and mkdir if folder exists

---
 auto_install/install.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index dfe775c..008b429 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -1012,14 +1012,14 @@ confOVPN() {
     # verify server name to strengthen security
     $SUDO sed -i "s/SRVRNAME/${SERVER_NAME}/" /etc/openvpn/easy-rsa/pki/Default.txt
 
-    $SUDO mkdir "/home/$pivpnUser/ovpns"
+    $SUDO mkdir -p "/home/$pivpnUser/ovpns"
     $SUDO chmod 0777 -R "/home/$pivpnUser/ovpns"
 }
 
 finalExports() {
     # Update variables in setupVars.conf file
     if [ -e "${setupVars}" ]; then
-        sed -i.update.bak '/pivpnUser/d;/UNATTUPG/d;/pivpnInterface/d;/IPv4dns/d;/IPv4addr/d;/IPv4gw/d;/pivpnProto/d;/PORT/d;/ENCRYPT/d;/DOWNLOAD_DH_PARAM/d;/PUBLICDNS/d;OVPNDNS1/d;OVPNDNS2/d;SERVER_NAME/d;' "${setupVars}"
+        sed -i.update.bak '/pivpnUser/d;/UNATTUPG/d;/pivpnInterface/d;/IPv4dns/d;/IPv4addr/d;/IPv4gw/d;/pivpnProto/d;/PORT/d;/ENCRYPT/d;/DOWNLOAD_DH_PARAM/d;/PUBLICDNS/d;/OVPNDNS1/d;/OVPNDNS2/d;/SERVER_NAME/d;' "${setupVars}"
     fi
     {
         echo "pivpnUser=${pivpnUser}"
@@ -1056,9 +1056,9 @@ finalExports() {
 #    #sed -i 's/PORT/PORT/g' ${setupVars}
 #    #sed -i 's/ENCRYPT/ENCRYPT/g' ${setupVars}
 #    #sed -i 's/DOWNLOAD_DH_PARAM/DOWNLOAD_DH_PARAM/g' ${setupVars}
-#    #sed -i 's/PUBLICDNS/PUBLICDNS/g' ${setupVars}
-#    #sed -i 's/OVPNDNS1/OVPNDNS1/g' ${setupVars}
-#    #sed -i 's/OVPNDNS2/OVPNDNS2/g' ${setupVars}
+#    sed -i 's/PUBLICDNS/PUBLIC_DNS/g' ${setupVars}
+#    sed -i 's/OVPNDNS1/OVPN_DNS_1/g' ${setupVars}
+#    sed -i 's/OVPNDNS2/OVPN_DNS_2/g' ${setupVars}
 #    #sed -i 's/SERVER_NAME/SERVER_NAME/g' ${setupVars}
 #}
 

From 5b5129f1bcf4818804a3d8e0e2a9ce2a51066b45 Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Tue, 14 Mar 2017 14:26:22 +1300
Subject: [PATCH 06/16] =?UTF-8?q?fix:=20cp:=20cannot=20stat=20=E2=80=98/tm?=
 =?UTF-8?q?p/pivpnINT=E2=80=99:=20No=20such=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto_install/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index 008b429..7dfcf30 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -1258,6 +1258,8 @@ main() {
         # Source ${setupVars} for use in the rest of the functions.
         source ${setupVars}
         
+		echo "${pivpnInterface}" > /tmp/pivpnINT
+		
         # Only try to set static on Raspbian
         if [[ $PLAT != "Raspbian" ]]; then
             echo "::: IP Information"

From 7315353179a8bca7b337e90d9a6f10412c26d0c1 Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Tue, 14 Mar 2017 15:25:39 +1300
Subject: [PATCH 07/16] Moved echo to file statements to front, add missing

fixed a typo
replaced tabs with spaces
---
 auto_install/install.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index 7dfcf30..0d7cf15 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -1084,21 +1084,19 @@ updatePiVPN() {
     installScripts
     
     # setCustomProto
-    echo "${pivpnProto}" > /tmp/pivpnPROTO
     # write out the PROTO
     PROTO=$pivpnProto
     $SUDO cp /tmp/pivpnPROTO /etc/pivpn/INSTALL_PROTO
     
     #setCustomPort
     # write out the port
-    echo ${PORT} > /tmp/INSTALL_PORT
     $SUDO cp /tmp/INSTALL_PORT /etc/pivpn/INSTALL_PORT
     
     confOpenVPN
     confNetwork
     confOVPN
     
-	# ?? Is this always OK? Also if you only select one DNS server ??
+    # ?? Is this always OK? Also if you only select one DNS server ??
     $SUDO sed -i '0,/\(dhcp-option DNS \)/ s/\(dhcp-option DNS \).*/\1'${OVPNDNS1}'\"/' /etc/openvpn/server.conf
     $SUDO sed -i '0,/\(dhcp-option DNS \)/! s/\(dhcp-option DNS \).*/\1'${OVPNDNS2}'\"/' /etc/openvpn/server.conf
 
@@ -1258,8 +1256,17 @@ main() {
         # Source ${setupVars} for use in the rest of the functions.
         source ${setupVars}
         
-		echo "${pivpnInterface}" > /tmp/pivpnINT
-		
+        echo "::: Using IP address: $IPv4addr"
+        echo "${IPv4addr%/*}" > /tmp/pivpnIP
+        echo "::: Using interface: $pivpnInterface"
+        echo "${pivpnInterface}" > /tmp/pivpnINT
+        echo "::: Using User: $pivpnUser"
+        echo "${pivpnUser}" > /tmp/pivpnUSR
+        echo "::: Using protocol: $pivpnProto"
+        echo "${pivpnProto}" > /tmp/pivpnPROTO
+        echo "::: Using port: $PORT"
+        echo ${PORT} > /tmp/INSTALL_PORT
+        
         # Only try to set static on Raspbian
         if [[ $PLAT != "Raspbian" ]]; then
             echo "::: IP Information"
@@ -1309,6 +1316,6 @@ main() {
     echo "::: The install log is located at: ${instalLogLoc}"
 }
 
-if [[ "${PVPN_TEST}" != true ]] ; then
+if [[ "${PIVPN_TEST}" != true ]] ; then
   main "$@"
 fi

From 097145392c4fd4c80022315571ef3e01fbcf5b3b Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Tue, 14 Mar 2017 15:39:07 +1300
Subject: [PATCH 08/16] set -e and set +e around line 800 to 815

I am not sure why this statement does not work with -e. We can also
remove the set -e statement altogether.
---
 auto_install/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index 0d7cf15..6a22ad7 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -798,6 +798,7 @@ confOpenVPN() {
     $SUDO mkdir /etc/openvpn/easy-rsa/pki
 
     # Write out new vars file
+	set +e
     IFS= read -d '' String <<"EOF"
 if [ -z "$EASYRSA_CALLER" ]; then
     echo "Nope." >&2
@@ -811,6 +812,7 @@ set_var EASYRSA_CURVE      secp384r1
 EOF
 
     echo "${String}" | $SUDO tee /etc/openvpn/easy-rsa/vars >/dev/null
+	set -e
 
     # Edit the KEY_SIZE variable in the vars file to set user chosen key size
     cd /etc/openvpn/easy-rsa || exit
@@ -1266,6 +1268,7 @@ main() {
         echo "${pivpnProto}" > /tmp/pivpnPROTO
         echo "::: Using port: $PORT"
         echo ${PORT} > /tmp/INSTALL_PORT
+        echo ":::"
         
         # Only try to set static on Raspbian
         if [[ $PLAT != "Raspbian" ]]; then

From 277a212a8f77b2968edd3fd9798afa32fcbf5849 Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Tue, 14 Mar 2017 15:39:53 +1300
Subject: [PATCH 09/16] tabs to spaces

---
 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 6a22ad7..ca7f2b9 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -798,7 +798,7 @@ confOpenVPN() {
     $SUDO mkdir /etc/openvpn/easy-rsa/pki
 
     # Write out new vars file
-	set +e
+    set +e
     IFS= read -d '' String <<"EOF"
 if [ -z "$EASYRSA_CALLER" ]; then
     echo "Nope." >&2
@@ -812,7 +812,7 @@ set_var EASYRSA_CURVE      secp384r1
 EOF
 
     echo "${String}" | $SUDO tee /etc/openvpn/easy-rsa/vars >/dev/null
-	set -e
+    set -e
 
     # Edit the KEY_SIZE variable in the vars file to set user chosen key size
     cd /etc/openvpn/easy-rsa || exit

From 7a65f083c4e552f61b38b118394f29c89b92691e Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Wed, 15 Mar 2017 00:49:25 +1300
Subject: [PATCH 10/16] added -n and -p options to pivpn add

::: Create a client ovpn profile, optional nopass
:::
::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password
<arg>]|[nopass] [-h|--help]
:::
::: Commands:
:::  nopass               Create a client without a password
:::  -n,--name            Name for the Client (default: 'raspberrypi')
:::  -p,--password        Password for the Client (no default)
:::  -h,--help            Show this help dialog
---
 scripts/makeOVPN.sh | 102 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 81 insertions(+), 21 deletions(-)

diff --git a/scripts/makeOVPN.sh b/scripts/makeOVPN.sh
index db15efe..1d501bd 100644
--- a/scripts/makeOVPN.sh
+++ b/scripts/makeOVPN.sh
@@ -10,6 +10,59 @@ TA="ta.key"
 INDEX="/etc/openvpn/easy-rsa/pki/index.txt"
 INSTALL_USER=$(cat /etc/pivpn/INSTALL_USER)
 
+helpFunc() {
+	echo "::: Create a client ovpn profile, optional nopass"
+	echo ":::"
+	echo "::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password <arg>]|[nopass] [-h|--help]"
+	echo ":::"
+	echo "::: Commands:"
+	echo ":::  nopass               Create a client without a password"
+	echo ":::  -n,--name            Name for the Client (default: '"$(hostname)"')"
+	echo ":::  -p,--password        Password for the Client (no default)"
+	echo ":::  -h,--help            Show this help dialog"
+}
+
+# Parse input arguments
+while test $# -gt 0
+do
+	_key="$1"
+	case "$_key" in
+		-n|--name|--name=*)
+			_val="${_key##--name=}"
+			if test "$_val" = "$_key"
+			then
+				test $# -lt 2 && echo "Missing value for the optional argument '$_key'." && exit 1
+				_val="$2"
+				shift
+			fi
+			NAME="$_val"
+			;;
+		-p|--password|--password=*)
+			_val="${_key##--password=}"
+			if test "$_val" = "$_key"
+			then
+				test $# -lt 2 && echo "Missing value for the optional argument '$_key'." && exit 1
+				_val="$2"
+				shift
+			fi
+			PASSWD="$_val"
+			;;
+		-h|--help)
+			helpFunc
+			exit 0
+			;;
+		nopass)
+			NO_PASS="1"
+			;;
+		*)
+			echo "Error: Got an unexpected argument '$1'" 
+			helpFunc
+			exit 1
+			;;
+	esac
+	shift
+done
+
 # Functions def
 
 function keynoPASS() {
@@ -27,25 +80,27 @@ EOF
 
 function keyPASS() {
 
-    stty -echo
-    while true
-    do
-        printf "Enter the password for the client:  "
-        read -r PASSWD
-        printf "\n"
-        printf "Enter the password again to verify:  "
-        read -r PASSWD2
-        printf "\n"
-        [ "${PASSWD}" = "${PASSWD2}" ] && break
-        printf "Passwords do not match! Please try again.\n"
-    done
-    stty echo
     if [[ -z "${PASSWD}" ]]; then
-        echo "You left the password blank"
-        echo "If you don't want a password, please run:"
-        echo "pivpn add nopass"
-        exit 1
-    fi
+        stty -echo
+        while true
+        do
+            printf "Enter the password for the client:  "
+            read -r PASSWD
+            printf "\n"
+            printf "Enter the password again to verify:  "
+            read -r PASSWD2
+            printf "\n"
+            [ "${PASSWD}" = "${PASSWD2}" ] && break
+            printf "Passwords do not match! Please try again.\n"
+        done
+        stty echo
+        if [[ -z "${PASSWD}" ]]; then
+            echo "You left the password blank"
+            echo "If you don't want a password, please run:"
+            echo "pivpn add nopass"
+            exit 1
+        fi
+	fi
     if [ ${#PASSWD} -lt 4 ] || [ ${#PASSWD} -gt 1024 ]
     then
         echo "Password must be between from 4 to 1024 characters"
@@ -69,8 +124,10 @@ EOF
 
 }
 
-printf "Enter a Name for the Client:  "
-read -r NAME
+if [ -z "${NAME}" ]; then
+    printf "Enter a Name for the Client:  "
+    read -r NAME
+fi
 
 if [[ "${NAME}" =~ [^a-zA-Z0-9] ]]; then
     echo "Name can only contain alphanumeric characters."
@@ -109,8 +166,11 @@ fi
 
 cd /etc/openvpn/easy-rsa || exit
 
-if [[ "$@" =~ "nopass" ]]; then
+if [[ "${NO_PASS}" =~ "1" ]]; then
     keynoPASS
+elif [[ -n "${PASSWD}" ]]; then
+    echo "Both nopass and password arguments passed to the script. Please use either one."
+	exit 1
 else
     keyPASS
 fi

From 56f24aa37218568a3828af43a987646af92b82fa Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Wed, 15 Mar 2017 02:36:12 +1300
Subject: [PATCH 11/16] added command line option to (batch) remove certs

::: Revoke a client ovpn profile
:::
::: Usage: pivpn <-r|revoke> [-h|--help] [<client-1>] ... [<client-n>]
...
:::
::: Commands:
:::  [none]               Interactive mode
:::  <client>             Client(s) to to revoke
:::  -h,--help            Show this help dialog
---
 pivpn                 |   5 +-
 scripts/makeOVPN.sh   |  95 ++++++++++++-------------
 scripts/removeOVPN.sh | 158 +++++++++++++++++++++++++++++-------------
 3 files changed, 159 insertions(+), 99 deletions(-)

diff --git a/pivpn b/pivpn
index fca88c2..4b191c0 100644
--- a/pivpn
+++ b/pivpn
@@ -55,7 +55,8 @@ function debugFunc {
 }
 
 function removeOVPNFunc {
-    $SUDO /opt/pivpn/removeOVPN.sh
+    shift
+    $SUDO /opt/pivpn/removeOVPN.sh "$@"
     exit 1
 }
 
@@ -94,7 +95,7 @@ case "$1" in
 "-c" | "clients"            ) listClientsFunc;;
 "-d" | "debug"              ) debugFunc;;
 "-l" | "list"               ) listOVPNFunc;;
-"-r" | "revoke"             ) removeOVPNFunc;;
+"-r" | "revoke"             ) removeOVPNFunc "$@";;
 "-h" | "help"               ) helpFunc;;
 "-u" | "uninstall"          ) uninstallFunc;;
 "-v"                        ) versionFunc;;
diff --git a/scripts/makeOVPN.sh b/scripts/makeOVPN.sh
index 1d501bd..a42454a 100644
--- a/scripts/makeOVPN.sh
+++ b/scripts/makeOVPN.sh
@@ -11,56 +11,57 @@ INDEX="/etc/openvpn/easy-rsa/pki/index.txt"
 INSTALL_USER=$(cat /etc/pivpn/INSTALL_USER)
 
 helpFunc() {
-	echo "::: Create a client ovpn profile, optional nopass"
-	echo ":::"
-	echo "::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password <arg>]|[nopass] [-h|--help]"
-	echo ":::"
-	echo "::: Commands:"
-	echo ":::  nopass               Create a client without a password"
-	echo ":::  -n,--name            Name for the Client (default: '"$(hostname)"')"
-	echo ":::  -p,--password        Password for the Client (no default)"
-	echo ":::  -h,--help            Show this help dialog"
+    echo "::: Create a client ovpn profile, optional nopass"
+    echo ":::"
+    echo "::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password <arg>]|[nopass] [-h|--help]"
+    echo ":::"
+    echo "::: Commands:"
+    echo ":::  [none]               Interactive mode"
+    echo ":::  nopass               Create a client without a password"
+    echo ":::  -n,--name            Name for the Client (default: '"$(hostname)"')"
+    echo ":::  -p,--password        Password for the Client (no default)"
+    echo ":::  -h,--help            Show this help dialog"
 }
 
 # Parse input arguments
 while test $# -gt 0
 do
-	_key="$1"
-	case "$_key" in
-		-n|--name|--name=*)
-			_val="${_key##--name=}"
-			if test "$_val" = "$_key"
-			then
-				test $# -lt 2 && echo "Missing value for the optional argument '$_key'." && exit 1
-				_val="$2"
-				shift
-			fi
-			NAME="$_val"
-			;;
-		-p|--password|--password=*)
-			_val="${_key##--password=}"
-			if test "$_val" = "$_key"
-			then
-				test $# -lt 2 && echo "Missing value for the optional argument '$_key'." && exit 1
-				_val="$2"
-				shift
-			fi
-			PASSWD="$_val"
-			;;
-		-h|--help)
-			helpFunc
-			exit 0
-			;;
-		nopass)
-			NO_PASS="1"
-			;;
-		*)
-			echo "Error: Got an unexpected argument '$1'" 
-			helpFunc
-			exit 1
-			;;
-	esac
-	shift
+    _key="$1"
+    case "$_key" in
+        -n|--name|--name=*)
+            _val="${_key##--name=}"
+            if test "$_val" = "$_key"
+            then
+                test $# -lt 2 && echo "Missing value for the optional argument '$_key'." && exit 1
+                _val="$2"
+                shift
+            fi
+            NAME="$_val"
+            ;;
+        -p|--password|--password=*)
+            _val="${_key##--password=}"
+            if test "$_val" = "$_key"
+            then
+                test $# -lt 2 && echo "Missing value for the optional argument '$_key'." && exit 1
+                _val="$2"
+                shift
+            fi
+            PASSWD="$_val"
+            ;;
+        -h|--help)
+            helpFunc
+            exit 0
+            ;;
+        nopass)
+            NO_PASS="1"
+            ;;
+        *)
+            echo "Error: Got an unexpected argument '$1'" 
+            helpFunc
+            exit 1
+            ;;
+    esac
+    shift
 done
 
 # Functions def
@@ -100,7 +101,7 @@ function keyPASS() {
             echo "pivpn add nopass"
             exit 1
         fi
-	fi
+    fi
     if [ ${#PASSWD} -lt 4 ] || [ ${#PASSWD} -gt 1024 ]
     then
         echo "Password must be between from 4 to 1024 characters"
@@ -170,7 +171,7 @@ if [[ "${NO_PASS}" =~ "1" ]]; then
     keynoPASS
 elif [[ -n "${PASSWD}" ]]; then
     echo "Both nopass and password arguments passed to the script. Please use either one."
-	exit 1
+    exit 1
 else
     keyPASS
 fi
diff --git a/scripts/removeOVPN.sh b/scripts/removeOVPN.sh
index 8f5773d..4e3515c 100644
--- a/scripts/removeOVPN.sh
+++ b/scripts/removeOVPN.sh
@@ -6,73 +6,131 @@ REVOKE_STATUS=$(cat /etc/pivpn/REVOKE_STATUS)
 PLAT=$(cat /etc/pivpn/DET_PLATFORM)
 INDEX="/etc/openvpn/easy-rsa/pki/index.txt"
 
+helpFunc() {
+    echo "::: Revoke a client ovpn profile"
+    echo ":::"
+    echo "::: Usage: pivpn <-r|revoke> [-h|--help] [<client-1>] ... [<client-n>] ..."
+    echo ":::"
+    echo "::: Commands:"
+    echo ":::  [none]               Interactive mode"
+    echo ":::  <client>             Client(s) to to revoke"
+    echo ":::  -h,--help            Show this help dialog"
+}
+
+# Parse input arguments
+while test $# -gt 0
+do
+    _key="$1"
+    case "$_key" in
+        -h|--help)
+            helpFunc
+            exit 0
+            ;;
+        *)
+            CERTS_TO_REVOKE+=("$1")
+            ;;
+    esac
+    shift
+done
+
 if [ ! -f "${INDEX}" ]; then
         printf "The file: %s was not found\n" "$INDEX"
         exit 1
 fi
 
-printf "\n"
-printf " ::\e[4m  Certificate List  \e[0m:: \n"
-
-i=0
-while read -r line || [ -n "$line" ]; do
-    STATUS=$(echo "$line" | awk '{print $1}')
-    if [[ "${STATUS}" = "V" ]]; then
-        NAME=$(echo "$line" | sed -e 's:.*/CN=::')
-        CERTS[$i]=${NAME}
-        if [ "$i" != 0 ]; then
-            # Prevent printing "server" certificate
-            printf "  %s\n" "$NAME"
+if [[ -z "${CERTS_TO_REVOKE}" ]]; then
+    printf "\n"
+    printf " ::\e[4m  Certificate List  \e[0m:: \n"
+    
+    i=0
+    while read -r line || [ -n "$line" ]; do
+        STATUS=$(echo "$line" | awk '{print $1}')
+        if [[ "${STATUS}" = "V" ]]; then
+            NAME=$(echo "$line" | sed -e 's:.*/CN=::')
+            CERTS[$i]=${NAME}
+            if [ "$i" != 0 ]; then
+                # Prevent printing "server" certificate
+                printf "  %s\n" "$NAME"
+            fi
+            let i=i+1
         fi
-        let i=i+1
+    done <${INDEX}
+    printf "\n"
+    
+    echo "::: Please enter the Name of the client to be revoked from the list above:"
+    read -r NAME
+    
+    if [[ -z "${NAME}" ]]; then
+        echo "You can not leave this blank!"
+        exit 1
     fi
-done <${INDEX}
-printf "\n"
-
-echo "::: Please enter the Name of the client to be revoked from the list above:"
-read -r NAME
-
-if [[ -z "${NAME}" ]]; then
-    echo "::: You can not leave this blank!"
-    exit 1
-fi
-
-for((x=1;x<=i;++x)); do
-    if [ "${CERTS[$x]}" = "${NAME}" ]; then
-        VALID=1
+    
+    for((x=1;x<=i;++x)); do
+        if [ "${CERTS[$x]}" = "${NAME}" ]; then
+            VALID=1
+        fi
+    done
+    
+    if [ -z "${VALID}" ]; then
+        printf "You didn't enter a valid cert name!\n"
+        exit 1
     fi
-done
-
-if [ -z "${VALID}" ]; then
-    printf "::: You didn't enter a valid cert name!\n"
-    exit 1
+    
+    CERTS_TO_REVOKE=( "${NAME}" )
+else
+    i=0
+    while read -r line || [ -n "$line" ]; do
+        STATUS=$(echo "$line" | awk '{print $1}')
+        if [[ "${STATUS}" = "V" ]]; then
+            NAME=$(echo "$line" | sed -e 's:.*/CN=::')
+            CERTS[$i]=${NAME}
+            let i=i+1
+        fi
+    done <${INDEX}
+    
+    for (( ii = 0; ii < ${#CERTS_TO_REVOKE[@]}; ii++)); do
+        VALID=0
+        for((x=1;x<=i;++x)); do
+            if [ "${CERTS[$x]}" = "${CERTS_TO_REVOKE[ii]}" ]; then
+                VALID=1
+            fi
+        done
+        
+        if [ "${VALID}" != 1 ]; then
+            printf "You passed an invalid cert name: '"%s"'!\n" "${CERTS_TO_REVOKE[ii]}"
+            exit 1
+        fi
+    done
 fi
 
 cd /etc/openvpn/easy-rsa || exit
 
 if [ "${REVOKE_STATUS}" == 0 ]; then
-        echo 1 > /etc/pivpn/REVOKE_STATUS
-        printf "\nThis seems to be the first time you have revoked a cert.\n"
+    echo 1 > /etc/pivpn/REVOKE_STATUS
+    printf "\nThis seems to be the first time you have revoked a cert.\n"
     printf "First we need to initialize the Certificate Revocation List.\n"
-        printf "Then add the CRL to your server config and restart openvpn.\n"
+    printf "Then add the CRL to your server config and restart openvpn.\n"
     ./easyrsa gen-crl
     cp pki/crl.pem /etc/openvpn/crl.pem
     chown nobody:nogroup /etc/openvpn/crl.pem
-        sed -i '/#crl-verify/c\crl-verify /etc/openvpn/crl.pem' /etc/openvpn/server.conf
-        if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then
-            service openvpn restart
-        else
-            systemctl restart openvpn.service
-        fi
+    sed -i '/#crl-verify/c\crl-verify /etc/openvpn/crl.pem' /etc/openvpn/server.conf
+    if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then
+        service openvpn restart
+    else
+        systemctl restart openvpn.service
+    fi
 fi
 
-./easyrsa --batch revoke "${NAME}"
-./easyrsa gen-crl
-printf "\n::: Certificate revoked, and CRL file updated.\n"
-printf "::: Removing certs and client configuration for this profile.\n"
-rm -rf "pki/reqs/${NAME}.req"
-rm -rf "pki/private/${NAME}.key"
-rm -rf "pki/issued/${NAME}.crt"
-rm -rf "/home/${INSTALL_USER}/ovpns/${NAME}.ovpn"
-cp /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn/crl.pem
+for (( ii = 0; ii < ${#CERTS_TO_REVOKE[@]}; ii++)); do
+    printf "\n::: Revoking certificate '"%s"'.\n" "${CERTS_TO_REVOKE[ii]}"
+    ./easyrsa --batch revoke "${CERTS_TO_REVOKE[ii]}"
+    ./easyrsa gen-crl
+    printf "\n::: Certificate revoked, and CRL file updated.\n"
+    printf "::: Removing certs and client configuration for this profile.\n"
+    rm -rf "pki/reqs/${CERTS_TO_REVOKE[ii]}.req"
+    rm -rf "pki/private/${CERTS_TO_REVOKE[ii]}.key"
+    rm -rf "pki/issued/${CERTS_TO_REVOKE[ii]}.crt"
+    rm -rf "/home/${INSTALL_USER}/ovpns/${CERTS_TO_REVOKE[ii]}.ovpn"
+    cp /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn/crl.pem
+done
 printf "::: Completed!\n"

From 75b7995a878affefc3fa4a4b044c7723c16267a3 Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Wed, 15 Mar 2017 02:40:39 +1300
Subject: [PATCH 12/16] Removed SERVER_NAME parameter

because it is hardcoded as "server" in other scripts
---
 auto_install/install.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index ca7f2b9..f75d8c0 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -771,6 +771,8 @@ setClientDNS() {
 }
 
 confOpenVPN() {
+    SERVER_NAME="server"
+	
     if [[ ${useUpdateVars} == false ]]; then
         # Ask user for desired level of encryption
         ENCRYPT=$(whiptail --backtitle "Setup OpenVPN" --title "Encryption Strength" --radiolist \
@@ -1021,7 +1023,7 @@ confOVPN() {
 finalExports() {
     # Update variables in setupVars.conf file
     if [ -e "${setupVars}" ]; then
-        sed -i.update.bak '/pivpnUser/d;/UNATTUPG/d;/pivpnInterface/d;/IPv4dns/d;/IPv4addr/d;/IPv4gw/d;/pivpnProto/d;/PORT/d;/ENCRYPT/d;/DOWNLOAD_DH_PARAM/d;/PUBLICDNS/d;/OVPNDNS1/d;/OVPNDNS2/d;/SERVER_NAME/d;' "${setupVars}"
+        sed -i.update.bak '/pivpnUser/d;/UNATTUPG/d;/pivpnInterface/d;/IPv4dns/d;/IPv4addr/d;/IPv4gw/d;/pivpnProto/d;/PORT/d;/ENCRYPT/d;/DOWNLOAD_DH_PARAM/d;/PUBLICDNS/d;/OVPNDNS1/d;/OVPNDNS2/d;' "${setupVars}"
     fi
     {
         echo "pivpnUser=${pivpnUser}"
@@ -1037,7 +1039,6 @@ finalExports() {
         echo "PUBLICDNS=${PUBLICDNS}"
         echo "OVPNDNS1=${OVPNDNS1}"
         echo "OVPNDNS2=${OVPNDNS2}"
-        echo "SERVER_NAME=${SERVER_NAME}"
     }>> "${setupVars}"
 }
 
@@ -1061,7 +1062,6 @@ finalExports() {
 #    sed -i 's/PUBLICDNS/PUBLIC_DNS/g' ${setupVars}
 #    sed -i 's/OVPNDNS1/OVPN_DNS_1/g' ${setupVars}
 #    sed -i 's/OVPNDNS2/OVPN_DNS_2/g' ${setupVars}
-#    #sed -i 's/SERVER_NAME/SERVER_NAME/g' ${setupVars}
 #}
 
 installPiVPN() {
@@ -1073,7 +1073,6 @@ installPiVPN() {
     setCustomPort
     confOpenVPN
     confNetwork
-    SERVER_NAME="server"
     confOVPN
     setClientDNS
     finalExports

From 27c34aa297d233c895c1fc7975e7e808aa883cfd Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Wed, 15 Mar 2017 17:24:42 +1300
Subject: [PATCH 13/16] Removed -p flag to create home dir

As described in #165 ( fc14664) it is not desirable.
---
 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 f75d8c0..5890c41 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -1016,7 +1016,7 @@ confOVPN() {
     # verify server name to strengthen security
     $SUDO sed -i "s/SRVRNAME/${SERVER_NAME}/" /etc/openvpn/easy-rsa/pki/Default.txt
 
-    $SUDO mkdir -p "/home/$pivpnUser/ovpns"
+    $SUDO mkdir "/home/$pivpnUser/ovpns"
     $SUDO chmod 0777 -R "/home/$pivpnUser/ovpns"
 }
 

From cd4d13691d3a4376b26f53415a25781c36b8c915 Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Thu, 16 Mar 2017 22:25:17 +1300
Subject: [PATCH 14/16] fixed check for when both nopass and a password
 argument are passed to the script

---
 auto_install/install.sh | 2 +-
 scripts/makeOVPN.sh     | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index 5890c41..bdb09d2 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -772,7 +772,7 @@ setClientDNS() {
 
 confOpenVPN() {
     SERVER_NAME="server"
-	
+    
     if [[ ${useUpdateVars} == false ]]; then
         # Ask user for desired level of encryption
         ENCRYPT=$(whiptail --backtitle "Setup OpenVPN" --title "Encryption Strength" --radiolist \
diff --git a/scripts/makeOVPN.sh b/scripts/makeOVPN.sh
index a42454a..00c59a7 100644
--- a/scripts/makeOVPN.sh
+++ b/scripts/makeOVPN.sh
@@ -168,10 +168,11 @@ fi
 cd /etc/openvpn/easy-rsa || exit
 
 if [[ "${NO_PASS}" =~ "1" ]]; then
-    keynoPASS
-elif [[ -n "${PASSWD}" ]]; then
-    echo "Both nopass and password arguments passed to the script. Please use either one."
-    exit 1
+    if [[ -n "${PASSWD}" ]]; then
+        echo "Both nopass and password arguments passed to the script. Please use either one."
+        exit 1
+    else
+        keynoPASS
 else
     keyPASS
 fi

From cb482d6697877e4d046c3da1104f511be1a1c3e2 Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Thu, 16 Mar 2017 22:28:50 +1300
Subject: [PATCH 15/16] added fi to if-statement

---
 scripts/makeOVPN.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/makeOVPN.sh b/scripts/makeOVPN.sh
index 00c59a7..f1308f1 100644
--- a/scripts/makeOVPN.sh
+++ b/scripts/makeOVPN.sh
@@ -173,6 +173,7 @@ if [[ "${NO_PASS}" =~ "1" ]]; then
         exit 1
     else
         keynoPASS
+    fi
 else
     keyPASS
 fi

From ff97f40ecfcb52f3e6be4538e331fa43dd5e9d38 Mon Sep 17 00:00:00 2001
From: EWouters <E.H.Wouters@student.tudelft.nl>
Date: Wed, 22 Mar 2017 13:47:55 +1300
Subject: [PATCH 16/16] =?UTF-8?q?Fix:=20mkdir:=20cannot=20create=20directo?=
 =?UTF-8?q?ry=20=E2=80=98/home/$pivpnUser/ovpns=E2=80=99:=20File=20exists?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto_install/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index bdb09d2..21367c1 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -1016,7 +1016,9 @@ confOVPN() {
     # verify server name to strengthen security
     $SUDO sed -i "s/SRVRNAME/${SERVER_NAME}/" /etc/openvpn/easy-rsa/pki/Default.txt
 
-    $SUDO mkdir "/home/$pivpnUser/ovpns"
+    if [ ! -d "/home/$pivpnUser/ovpns" ]; then
+        $SUDO mkdir "/home/$pivpnUser/ovpns"
+    fi
     $SUDO chmod 0777 -R "/home/$pivpnUser/ovpns"
 }