From 0f2c2ab54f085783e84148669dde709011ee7ecc Mon Sep 17 00:00:00 2001 From: zocker-160 Date: Tue, 20 Feb 2018 13:11:29 +0100 Subject: [PATCH 1/2] add option to exit --- openvpn-install.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index ee420ca..fda60fa 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -75,7 +75,7 @@ if [[ -e /etc/openvpn/server.conf ]]; then echo "" echo "What do you want to do?" echo " 1) Add a new user" - echo " 2) Revoke an existing user" + echo " 2) Show and revoke existing users" echo " 3) Remove OpenVPN" echo " 4) Exit" read -p "Select an option [1-4]: " option @@ -106,9 +106,12 @@ if [[ -e /etc/openvpn/server.conf ]]; then echo "Select the existing client certificate you want to revoke" tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep "^V" | cut -d '=' -f 2 | nl -s ') ' if [[ "$NUMBEROFCLIENTS" = '1' ]]; then - read -p "Select one client [1]: " CLIENTNUMBER + read -p "Select one client [1] or 'x' to exit: " CLIENTNUMBER else - read -p "Select one client [1-$NUMBEROFCLIENTS]: " CLIENTNUMBER + read -p "Select one client [1-$NUMBEROFCLIENTS] or 'x' to exit: " CLIENTNUMBER + fi + if [[ "$CLIENTNUMBER" = 'x' ]]; then + exit fi CLIENT=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep "^V" | cut -d '=' -f 2 | sed -n "$CLIENTNUMBER"p) cd /etc/openvpn/easy-rsa/ @@ -422,4 +425,4 @@ verb 3" > /etc/openvpn/client-common.txt echo "" echo "Your client configuration is available at" ~/"$CLIENT.ovpn" echo "If you want to add more clients, you simply need to run this script again!" -fi \ No newline at end of file +fi From a2e5551e4600d9cb2f50b193dba423b410547c85 Mon Sep 17 00:00:00 2001 From: zocker-160 <36563538+zocker-160@users.noreply.github.com> Date: Tue, 20 Feb 2018 13:17:55 +0100 Subject: [PATCH 2/2] minor fix --- openvpn-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index fda60fa..43399ea 100644 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -94,7 +94,7 @@ if [[ -e /etc/openvpn/server.conf ]]; then exit ;; 2) - # This option could be documented a bit better and maybe even be simplimplified + # This option could be documented a bit better and maybe even be simplified # ...but what can I say, I want some sleep too NUMBEROFCLIENTS=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep -c "^V") if [[ "$NUMBEROFCLIENTS" = '0' ]]; then