nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify select_vars(): Use EASYRSA_NO_VARS or EASYRSA_VARS_FILE

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-09-24 21:11:42 +01:00
parent cc9a19cf28
commit 632b369cd6
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
easyrsa3/easyrsa
View File

@ -5615,14 +5615,14 @@ select_vars() {
# User specified vars file will be used ONLY
elif [ "$EASYRSA_VARS_FILE" ]; then
verbose "select_vars: EASYRSA_VARS_FILE"
source_vars "$EASYRSA_VARS_FILE"
# User specified PKI; if vars exists, use it ONLY
elif [ "$EASYRSA_PKI" ]; then
if [ -e "$EASYRSA_PKI/vars" ]; then
verbose "select_vars: source EASYRSA_PKI/vars"
EASYRSA_VARS_FILE="$EASYRSA_PKI/vars"
source_vars "$EASYRSA_VARS_FILE"
else
EASYRSA_NO_VARS=1
fi
# User specified EASYRSA; if vars exists, use it ONLY
@ -5630,7 +5630,8 @@ select_vars() {
if [ -e "$EASYRSA/vars" ]; then
verbose "select_vars: EASYRSA/vars"
EASYRSA_VARS_FILE="$EASYRSA/vars"
source_vars "$EASYRSA_VARS_FILE"
else
EASYRSA_NO_VARS=1
fi
# Default PKI; if vars exists, use it ONLY
@ -5650,19 +5651,21 @@ select_vars() {
verbose "select_vars: PWD/pki/vars"
EASYRSA_VARS_FILE="$PWD/pki/vars"
source_vars "$EASYRSA_VARS_FILE"
# Default working dir; if vars exists, use it ONLY
elif [ -e "$PWD/vars" ]; then
verbose "select_vars: PWD/vars"
EASYRSA_VARS_FILE="$PWD/vars"
source_vars "$EASYRSA_VARS_FILE"
else
information "\
No Easy-RSA 'vars' configuration file exists!"
EASYRSA_NO_VARS=1
fi
} # => setup_vars()
# source the vars file
source_vars "$EASYRSA_VARS_FILE"
} # => select_vars()
# Source a vars file
source_vars() {