Upgrade_23: Prioritise new PKI creation to allow temp file creation
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
parent
940a94dee9
commit
8c6948c4cc
@ -4898,7 +4898,7 @@ up23_verify_current_ca ()
|
|||||||
then
|
then
|
||||||
CURRENT_CA_IS_VERIFIED="partially"
|
CURRENT_CA_IS_VERIFIED="partially"
|
||||||
else
|
else
|
||||||
up23_fail_upgrade "CA certificate does not match vars file settings"
|
warn "CA certificate does not match vars file settings"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
opts="-certopt no_pubkey,no_sigdump"
|
opts="-certopt no_pubkey,no_sigdump"
|
||||||
@ -5156,14 +5156,14 @@ up23_do_upgrade_23 ()
|
|||||||
up23_verbose ""
|
up23_verbose ""
|
||||||
|
|
||||||
up23_verify_new_pki
|
up23_verify_new_pki
|
||||||
|
up23_create_new_pki
|
||||||
|
up23_create_openssl_cnf
|
||||||
up23_verify_current_pki
|
up23_verify_current_pki
|
||||||
up23_verify_current_ca
|
up23_verify_current_ca
|
||||||
up23_backup_current_pki
|
up23_backup_current_pki
|
||||||
up23_create_new_pki
|
|
||||||
up23_upgrade_ca
|
up23_upgrade_ca
|
||||||
up23_move_easyrsa2_programs
|
up23_move_easyrsa2_programs
|
||||||
up23_build_v3_vars
|
up23_build_v3_vars
|
||||||
up23_create_openssl_cnf
|
|
||||||
|
|
||||||
if [ "$NOSAVE" -eq 0 ]
|
if [ "$NOSAVE" -eq 0 ]
|
||||||
then
|
then
|
||||||
@ -5734,6 +5734,7 @@ case "$cmd" in
|
|||||||
make_safe_ssl "$@"
|
make_safe_ssl "$@"
|
||||||
;;
|
;;
|
||||||
upgrade)
|
upgrade)
|
||||||
|
secure_session
|
||||||
up23_manage_upgrade_23 "$@"
|
up23_manage_upgrade_23 "$@"
|
||||||
;;
|
;;
|
||||||
""|help|-h|--help|--usage)
|
""|help|-h|--help|--usage)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user