Merge aafcfeb68a into a8f252e45d
This commit is contained in:
commit
c10e0fff6f
21
acme.sh
21
acme.sh
@ -5853,6 +5853,16 @@ installcert() {
|
|||||||
_installcert "$_main_domain" "$_real_cert" "$_real_key" "$_real_ca" "$_real_fullchain" "$_reload_cmd"
|
_installcert "$_main_domain" "$_real_cert" "$_real_key" "$_real_ca" "$_real_fullchain" "$_reload_cmd"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_checkSkip() {
|
||||||
|
_src="$1"
|
||||||
|
_dst="$2"
|
||||||
|
|
||||||
|
if [ ! "$_dst" ]; then return 0; fi
|
||||||
|
if [ ! -f "$_dst" ] || [ "$_dst" -ot "$_src" ]; then return 1; fi
|
||||||
|
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
#domain cert key ca fullchain reloadcmd backup-prefix
|
#domain cert key ca fullchain reloadcmd backup-prefix
|
||||||
_installcert() {
|
_installcert() {
|
||||||
_main_domain="$1"
|
_main_domain="$1"
|
||||||
@ -5879,6 +5889,17 @@ _installcert() {
|
|||||||
_real_fullchain=""
|
_real_fullchain=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -z "$FORCE" ] && \
|
||||||
|
_checkSkip "$CERT_PATH" "$_real_cert" && \
|
||||||
|
_checkSkip "$CA_CERT_PATH" "$_real_ca" && \
|
||||||
|
_checkSkip "$CERT_KEY_PATH" "$_real_key" && \
|
||||||
|
_checkSkip "$CERT_FULLCHAIN_PATH" "$_real_fullchain" ; then
|
||||||
|
|
||||||
|
_info "Skip, no destination file needs an update."
|
||||||
|
_info "Add '$(__red '--force')' to force the installation."
|
||||||
|
return $RENEW_SKIP
|
||||||
|
fi
|
||||||
|
|
||||||
_backup_path="$DOMAIN_BACKUP_PATH/$_backup_prefix"
|
_backup_path="$DOMAIN_BACKUP_PATH/$_backup_prefix"
|
||||||
mkdir -p "$_backup_path"
|
mkdir -p "$_backup_path"
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user