Merge pull request #1065 from Hir0-84/enhancement/issue_no281

Fix issue pivpn#281

scripts/openvpn/makeOVPN.sh

@@ -20,7 +20,7 @@ source "${setupVars}"
 helpFunc() {
     echo "::: Create a client ovpn profile, optional nopass"
     echo ":::"
-    echo "::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password <arg>]|[nopass] [-d|--days <number>] [-b|--bitwarden] [-i|--iOS] [-h|--help]"
+    echo "::: Usage: pivpn <-a|add> [-n|--name <arg>] [-p|--password <arg>]|[nopass] [-d|--days <number>] [-b|--bitwarden] [-i|--iOS] [-o|--ovpn] [-h|--help]"
     echo ":::"
     echo "::: Commands:"
     echo ":::  [none]               Interactive mode"
@@ -30,6 +30,7 @@ helpFunc() {
     echo ":::  -d,--days            Expire the certificate after specified number of days (default: 1080)"
     echo ":::  -b,--bitwarden       Create and save a client through Bitwarden"
     echo ":::  -i,--iOS             Generate a certificate that leverages iOS keychain"
+    echo ":::  -o,--ovpn            Regenerate a .ovpn config file for an existing client"
     echo ":::  -h,--help            Show this help dialog"
 }
 
@@ -97,6 +98,10 @@ do
                echo "Bitwarden not found, please install bitwarden"
                exit 1
             fi
+
+            ;;
+        -o|--ovpn)
+            GENOVPNONLY=1
             ;;
         *)
             echo "Error: Got an unexpected argument '$1'"
@@ -248,6 +253,10 @@ if [[ -z "${NAME}" ]]; then
     exit 1
 fi
 
+if [ "${GENOVPNONLY}" == "1" ]; then
+    # Generate .ovpn configuration file
+    cd /etc/openvpn/easy-rsa/pki || exit
+else
     # Check if name is already in use
     while read -r line || [ -n "${line}" ]; do
         STATUS=$(echo "$line" | awk '{print $1}')
@@ -282,7 +291,6 @@ if [[ ! "$DAYS" =~ ^[0-9]+$ ]] || [ "$DAYS" -lt 1 ] || [ "$DAYS" -gt 3650 ]; the
         #The CRL lasts 3650 days so it doesn't make much sense that certificates would last longer
         echo "Please input a valid number of days, between 1 and 3650 inclusive."
         exit 1
-
     fi
 
     cd /etc/openvpn/easy-rsa || exit
@@ -297,6 +305,7 @@ if [[ "${NO_PASS}" =~ "1" ]]; then
     else
         keyPASS
     fi
+fi
 
 #1st Verify that clients Public Key Exists
 if [ ! -f "issued/${NAME}${CRT}" ]; then