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

Merge branch 'TinCanTech-fix-make-cadir'

Browse Source 
Ref: #627 #633

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-08-14 17:10:19 +01:00
commit ceef45784e
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
easyrsa3/easyrsa
View File

@ -977,7 +977,7 @@ and initialize a fresh PKI here."
Your newly created PKI dir is:
* $EASYRSA_PKI"
if [ "$user_vars_true" ]; then
if [ "$user_vars_true" ] || [ "$old_vars_true" ]; then
: # ok - No message required
else
message "\
@ -1038,11 +1038,11 @@ install_data_to_pki () {
# Find and copy data-files, in specific order
for area in \
'/etc/easy-rsa' \
'/usr/share/easy-rsa' \
'/usr/local/share/easy-rsa' \
'/usr/share/easy-rsa' \
"$PWD" \
"${0%/*}" \
'/etc/easy-rsa' \
# EOL - # Add more distros here
do
# Omitting "$vars_file"
@ -1079,12 +1079,18 @@ install_data_to_pki () {
fi
# Create PKI/vars from PKI/example
unset -v old_vars_true
case "$context" in
init-pki)
if [ -e "${EASYRSA_PKI}/${vars_file_example}" ]; then
[ -e "${EASYRSA_PKI}/${vars_file}" ] || \
cp "${EASYRSA_PKI}/${vars_file_example}" \
"${EASYRSA_PKI}/${vars_file}" || :
if [ -e ./vars ]; then
# If the old vars exists then do nothing
old_vars_true=1
else
if [ -e "${EASYRSA_PKI}/${vars_file_example}" ]; then
[ -e "${EASYRSA_PKI}/${vars_file}" ] || \
cp "${EASYRSA_PKI}/${vars_file_example}" \
"${EASYRSA_PKI}/${vars_file}" || :
fi
fi
;;
vars-setup)
@ -4741,9 +4747,12 @@ cmd="$1"
# This avoids unnecessary warnings and notices
case "$cmd" in
init-pki|clean-all|""|help|-h|--help|--usage|version)
unset -v pki_is_required; no_pki_required=1 ;;
no_pki_required=1
unset -v pki_is_required
;;
*)
pki_is_required=1; unset -v no_pki_required
pki_is_required=1
unset -v no_pki_required
esac
# Intelligent env-var detection and auto-loading: