readjustment for PR comments
This commit is contained in:
parent
b8f0eed80c
commit
e858f5b6b2
1 changed files with 6 additions and 6 deletions
|
|
@ -668,13 +668,13 @@ function installOpenVPN () {
|
||||||
SERVER_NAME="server_$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)"
|
SERVER_NAME="server_$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)"
|
||||||
echo "set_var EASYRSA_REQ_CN $SERVER_CN" >> vars
|
echo "set_var EASYRSA_REQ_CN $SERVER_CN" >> vars
|
||||||
|
|
||||||
# Workaround to remove unharmful error until easy-rsa 3.0.7
|
|
||||||
# https://github.com/OpenVPN/easy-rsa/issues/261
|
|
||||||
cd /etc/openvpn/easy-rsa/
|
|
||||||
sed -i 's/^RANDFILE/#RANDFILE/g' pki/openssl-easyrsa.cnf
|
|
||||||
|
|
||||||
# Create the PKI, set up the CA, the DH params and the server certificate
|
# Create the PKI, set up the CA, the DH params and the server certificate
|
||||||
./easyrsa init-pki
|
./easyrsa init-pki
|
||||||
|
|
||||||
|
# Workaround to remove unharmful error until easy-rsa 3.0.7
|
||||||
|
# https://github.com/OpenVPN/easy-rsa/issues/261
|
||||||
|
sed -i 's/^RANDFILE/#RANDFILE/g' pki/openssl-easyrsa.cnf
|
||||||
|
|
||||||
./easyrsa --batch build-ca nopass
|
./easyrsa --batch build-ca nopass
|
||||||
|
|
||||||
if [[ $DH_TYPE == "2" ]]; then
|
if [[ $DH_TYPE == "2" ]]; then
|
||||||
|
|
@ -1142,7 +1142,7 @@ function removeOpenVPN () {
|
||||||
read -rp "Do you really want to remove OpenVPN? [y/n]: " -e -i n REMOVE
|
read -rp "Do you really want to remove OpenVPN? [y/n]: " -e -i n REMOVE
|
||||||
if [[ "$REMOVE" = 'y' ]]; then
|
if [[ "$REMOVE" = 'y' ]]; then
|
||||||
# Get OpenVPN port from the configuration
|
# Get OpenVPN port from the configuration
|
||||||
PORT=$(grep '^port ' /etc/op envpn/server.conf | cut -d " " -f 2)
|
PORT=$(grep '^port ' /etc/openvpn/server.conf | cut -d " " -f 2)
|
||||||
|
|
||||||
# Stop OpenVPN
|
# Stop OpenVPN
|
||||||
if [[ "$OS" =~ (fedora|arch|centos) ]]; then
|
if [[ "$OS" =~ (fedora|arch|centos) ]]; then
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue