Merge pull request #1091 from gi8lino/master

add parameter to force remove profile

scripts/openvpn/removeOVPN.sh

@@ -14,11 +14,12 @@ source "${setupVars}"
 helpFunc() {
     echo "::: Revoke a client ovpn profile"
     echo ":::"
-    echo "::: Usage: pivpn <-r|revoke> [-h|--help] [<client-1>] ... [<client-n>] ..."
+    echo "::: Usage: pivpn <-r|revoke> [-y|--yes] [-h|--help] [<client-1>] ... [<client-n>] ..."
     echo ":::"
     echo "::: Commands:"
     echo ":::  [none]               Interactive mode"
     echo ":::  <client>             Client(s) to to revoke"
+    echo ":::  -y,--yes             Remove Client(s) without confirmation"
     echo ":::  -h,--help            Show this help dialog"
 }
 
@@ -31,6 +32,9 @@ do
             helpFunc
             exit 0
             ;;
+        -y|--yes)
+            CONFIRM=true
+            ;;
         *)
             CERTS_TO_REVOKE+=("$1")
             ;;
@@ -111,6 +115,12 @@ fi
 cd /etc/openvpn/easy-rsa || exit
 
 for (( ii = 0; ii < ${#CERTS_TO_REVOKE[@]}; ii++)); do
+    if [ -n "$CONFIRM" ]; then
+        REPLY="y"
+    else
+        read -r -p "Do you really want to revoke ${CERTS_TO_REVOKE[ii]}? [Y/n] "
+    fi
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
         printf "\n::: Revoking certificate '"%s"'.\n" "${CERTS_TO_REVOKE[ii]}"
         ./easyrsa --batch revoke "${CERTS_TO_REVOKE[ii]}"
         ./easyrsa gen-crl
@@ -138,5 +148,6 @@ for (( ii = 0; ii < ${#CERTS_TO_REVOKE[@]}; ii++)); do
                 echo "::: Failed to reload pihole-FTL configuration"
             fi
         fi
+    fi
 done
 printf "::: Completed!\n"

scripts/wireguard/removeCONF.sh

@@ -12,11 +12,12 @@ source "${setupVars}"
 helpFunc(){
     echo "::: Remove a client conf profile"
     echo ":::"
-    echo "::: Usage: pivpn <-r|remove> [-h|--help] [<client-1>] ... [<client-n>] ..."
+    echo "::: Usage: pivpn <-r|remove> [-y|--yes] [-h|--help] [<client-1>] ... [<client-n>] ..."
     echo ":::"
     echo "::: Commands:"
     echo ":::  [none]               Interactive mode"
     echo ":::  <client>             Client(s) to remove"
+    echo ":::  -y,--yes             Remove Client(s) without confirmation"
     echo ":::  -h,--help            Show this help dialog"
 }
 
@@ -29,6 +30,9 @@ do
             helpFunc
             exit 0
             ;;
+        -y|--yes)
+            CONFIRM=true
+            ;;
         *)
             CLIENTS_TO_REMOVE+=("$1")
             ;;
@@ -68,7 +72,11 @@ for CLIENT_NAME in "${CLIENTS_TO_REMOVE[@]}"; do
         echo -e "::: \e[1m${CLIENT_NAME}\e[0m does not exist"
     else
         REQUESTED="$(sha256sum "configs/${CLIENT_NAME}.conf" | cut -c 1-64)"
+        if [ -n "$CONFIRM" ]; then
+            REPLY="y"
+        else
             read -r -p "Do you really want to delete $CLIENT_NAME? [Y/n] "
+        fi
 
         if [[ $REPLY =~ ^[Yy]$ ]]; then