Revert "Making Client Revocation Headless and Documenting New Feature"

This reverts commit b8bdb1a56b.
This commit is contained in:
Dominic Dumrauf (MacBook Pro 2017) 2019-09-18 09:33:57 +01:00
parent 43966b9e25
commit 7486e3a2e4
2 changed files with 9 additions and 24 deletions

View file

@ -77,19 +77,6 @@ Other variables can be set depending on your choice (encryption, compression). Y
Password-protected clients are not supported by the headless installation method since user input is expected by Easy-RSA. Password-protected clients are not supported by the headless installation method since user input is expected by Easy-RSA.
### Headless User Removal
The removal of an existing user can also be fully automated. Again, the key is to provide the (string) value of the `MENU_OPTION` variable along with the remaining mandatory variables before invoking the script.
The following Bash script removes the existing user `bar` from an OpenVPN configuration
```bash
#!/bin/bash
export MENU_OPTION="2"
export CLIENT="bar"
./openvpn-install.sh
```
## Features ## Features
- Installs and configures a ready-to-use OpenVPN server - Installs and configures a ready-to-use OpenVPN server

View file

@ -1072,18 +1072,16 @@ function revokeClient () {
exit 1 exit 1
fi fi
until [[ "$CLIENT" =~ ^[a-zA-Z0-9_]+$ ]]; do 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 ') '
tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep "^V" | cut -d '=' -f 2 | nl -s ') ' if [[ "$NUMBEROFCLIENTS" = '1' ]]; then
if [[ "$NUMBEROFCLIENTS" = '1' ]]; then read -rp "Select one client [1]: " CLIENTNUMBER
read -rp "Select one client [1]: " CLIENTNUMBER else
else read -rp "Select one client [1-$NUMBEROFCLIENTS]: " CLIENTNUMBER
read -rp "Select one client [1-$NUMBEROFCLIENTS]: " CLIENTNUMBER fi
fi
CLIENT=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep "^V" | cut -d '=' -f 2 | sed -n "$CLIENTNUMBER"p) CLIENT=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep "^V" | cut -d '=' -f 2 | sed -n "$CLIENTNUMBER"p)
done
cd /etc/openvpn/easy-rsa/ cd /etc/openvpn/easy-rsa/
./easyrsa --batch revoke "$CLIENT" ./easyrsa --batch revoke "$CLIENT"
EASYRSA_CRL_DAYS=3650 ./easyrsa gen-crl EASYRSA_CRL_DAYS=3650 ./easyrsa gen-crl