Skip to content

Commit

Permalink
install_data_to_pki: Never create a pki/vars.example file
Browse files Browse the repository at this point in the history
Having a pki/vars.example file exist, leads to the incorrect conclusion
that a pki/vars file is suitable. Therefore, never create an example file.

Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Aug 30, 2023
1 parent f18c9a0 commit d05a89e
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -1455,9 +1455,9 @@ install_data_to_pki() {
EASYRSA_EXT_DIR "${area}/${x509_types_dir}"

# Find other files - Omitting "$vars_file"
# shellcheck disable=SC2066 # loop will only run once
for source in \
"$vars_file_example" \
"$ssl_cnf_file" \
"$ssl_cnf_file"
# EOL
do
# Find each item
Expand All @@ -1481,16 +1481,6 @@ install_data_to_pki $context: $EASYRSA_EXT_DIR"
return
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
unset -v new_vars_true
if [ "$found_vars" = 1 ] || [ "$user_vars_true" ] || \
Expand Down

0 comments on commit d05a89e

Please sign in to comment.