Merge 'TinCanTech-master' - Add 'init' to install_data_to_pki()
This will create EASYRSA_PKI/vars from example for all new PKIs. Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
commit
606cc48874
@ -560,7 +560,7 @@ and initialize a fresh PKI here."
|
||||
done
|
||||
|
||||
# Install data-files into ALL new PKIs
|
||||
install_data_to_pki || \
|
||||
install_data_to_pki init || \
|
||||
warn "Failed to install required data-files to PKI. (init)"
|
||||
|
||||
# Verify that $EASYRSA_SAFE_CONF exists ($OPENSSL_CONF)
|
||||
@ -667,6 +667,11 @@ install_data_to_pki () {
|
||||
fi
|
||||
done
|
||||
|
||||
# If this is init-pki then create PKI/vars from example
|
||||
if [ -n "$1" ] && [ -e "${EASYRSA_PKI}/${vars_file_example}" ]; then
|
||||
cp -f "${EASYRSA_PKI}/${vars_file_example}" "${EASYRSA_PKI}/${vars_file}"
|
||||
fi
|
||||
|
||||
# Check PKI is updated - Omit 'vars' and example.
|
||||
#[ -e "${EASYRSA_PKI}/${vars_file}" ] || return
|
||||
#[ -e "${EASYRSA_PKI}/${vars_file_example}" ] || return
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user