Skip to content

Commit

Permalink
init-pki: Remove unnecessary user information concerning vars
Browse files Browse the repository at this point in the history
Remove second warning on hard-reset which promotes soft-reset,
soft-reset will be removed.

Remove information concerning 'vars' file. 'init-pki' does not
create a 'vars' file in the PKI, therefore, the information is
no longer relevant.

Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Sep 5, 2023
1 parent bb1adae commit fab09e6
Showing 1 changed file with 0 additions and 33 deletions.
33 changes: 0 additions & 33 deletions easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -1293,14 +1293,6 @@ and initialize a fresh PKI here."
# now remove it:
case "$reset" in
hard)
# Promote use of soft init
# confirm "Completely remove current PKI ? " yes "\
#* SECOND WARNING!!!
#
#* This will remove everything in your current PKI directory.
# To keep your current settings use 'init-pki soft' instead.
# Using 'init-pki soft' is recommended."

# # # shellcheck disable=SC2115 # Use "${var:?}"
rm -rf "$EASYRSA_PKI" || \
die "init-pki hard reset failed."
Expand Down Expand Up @@ -1352,31 +1344,6 @@ Failed to install required data-files to PKI. (init)"
Your newly created PKI dir is:
* $EASYRSA_PKI"

# Installation information
# if $no_new_vars then there are one or more known vars
# which are not in the PKI
if [ "$no_new_vars" ]; then
warn "\
A vars file has not been created in your new PKI because
conflicting vars files have been found elsewhere."
vars_in_pki_msg
else
information "
Using Easy-RSA configuration:
* ${vars:-undefined}"
fi

# For new PKIs , pki/vars was auto-created, show message
if [ "$new_vars_true" ]; then
information "
IMPORTANT:
Easy-RSA 'vars' template file has been created in your new PKI.
Edit this 'vars' file to customise the settings for your PKI.
To use a global vars file, use global option --vars=<FILE>"

else
vars_in_pki_msg
fi
verbose "\
init_pki: x509-types dir ${EASYRSA_EXT_DIR:-Not found}"
} # => init_pki()
Expand Down

0 comments on commit fab09e6

Please sign in to comment.