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

init-pki: Never create a vars.example and vars file in the pki

Browse Source 
For 'init-pki, disable creating vars.example, which also disables
creating a vars file in the PKI.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-09-14 11:04:15 +01:00
parent 660895293b
commit eedb81e0e0
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
easyrsa3/easyrsa
View File

@ -1454,8 +1454,8 @@ install_data_to_pki() {
EASYRSA_EXT_DIR "${area}/${x509_types_dir}" EASYRSA_EXT_DIR "${area}/${x509_types_dir}"
# Find other files - Omitting "$vars_file" # Find other files - Omitting "$vars_file"
# shellcheck disable=2066 # Loop will only run once
for source in \ for source in \
"$vars_file_example" \
"$ssl_cnf_file" \ "$ssl_cnf_file" \
# EOL # EOL
do do
@ -1480,16 +1480,6 @@ install_data_to_pki: $context - COMPLETED"
return return
fi fi
# Always require a pki/vars.example file
if [ -e "$EASYRSA_PKI/vars.example" ];then
: # ok
else
create_vars_example > "$EASYRSA_PKI/vars.example" || \
die "install_data_to_pki - create_vars_example FAILED"
verbose "\
install_data_to_pki: $context - create_vars_example OK"
fi
# Create PKI/vars from PKI/example # Create PKI/vars from PKI/example
unset -v new_vars_true unset -v new_vars_true
if [ "$found_vars" = 1 ] || [ "$user_vars_true" ] || \ if [ "$found_vars" = 1 ] || [ "$user_vars_true" ] || \
@ -5640,7 +5630,6 @@ The 'vars' file was not found:
# set up PKI path vars - Top preference # set up PKI path vars - Top preference
pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars" pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
expected_pki_vars="$pki_vars"
# Some other place vars, out of scope. # Some other place vars, out of scope.
if [ "$EASYRSA" ]; then if [ "$EASYRSA" ]; then