mirror of
https://github.com/angristan/openvpn-install.git
synced 2025-05-09 10:18:22 +02:00
Merge c5ace8a03d37cbcafd83b017679ad1c8ae8fd59c into 7e32f6ae8373fe66e657cb693518c45768d0ea6e
This commit is contained in:
commit
0019211b8d
@ -1092,8 +1092,10 @@ verb 3" >>/etc/openvpn/client-template.txt
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Generate the custom client.ovpn
|
# Generate the custom client.ovpn
|
||||||
newClient
|
if [[ -n "${CLIENT}" ]]; then
|
||||||
echo "If you want to add more clients, you simply need to run this script another time!"
|
newClient
|
||||||
|
echo "If you want to add more clients, you simply need to run this script another time!"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function newClient() {
|
function newClient() {
|
||||||
@ -1119,7 +1121,7 @@ function newClient() {
|
|||||||
if [[ $CLIENTEXISTS == '1' ]]; then
|
if [[ $CLIENTEXISTS == '1' ]]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "The specified client CN was already found in easy-rsa, please choose another name."
|
echo "The specified client CN was already found in easy-rsa, please choose another name."
|
||||||
exit
|
exit 1
|
||||||
else
|
else
|
||||||
cd /etc/openvpn/easy-rsa/ || return
|
cd /etc/openvpn/easy-rsa/ || return
|
||||||
case $PASS in
|
case $PASS in
|
||||||
@ -1205,7 +1207,15 @@ function revokeClient() {
|
|||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Select the existing client certificate you want to revoke"
|
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 ') '
|
pki_clientnumbers="$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep "^V" | cut -d '=' -f 2 | nl -s ') ')"
|
||||||
|
|
||||||
|
echo "${pki_clientnumbers}"
|
||||||
|
|
||||||
|
if [[ -n "${CLIENT}" ]]; then
|
||||||
|
# Get PKI client number
|
||||||
|
CLIENTNUMBER=$(echo "${pki_clientnumbers}" | grep "${CLIENT}" | cut -d')' -f1 | xargs)
|
||||||
|
fi
|
||||||
|
|
||||||
until [[ $CLIENTNUMBER -ge 1 && $CLIENTNUMBER -le $NUMBEROFCLIENTS ]]; do
|
until [[ $CLIENTNUMBER -ge 1 && $CLIENTNUMBER -le $NUMBEROFCLIENTS ]]; do
|
||||||
if [[ $CLIENTNUMBER == '1' ]]; then
|
if [[ $CLIENTNUMBER == '1' ]]; then
|
||||||
read -rp "Select one client [1]: " CLIENTNUMBER
|
read -rp "Select one client [1]: " CLIENTNUMBER
|
||||||
|
Loading…
x
Reference in New Issue
Block a user