Update localcopy.sh

Fix tabbing
Add more debug/info
Only save conf values if not blank and if successful
pull/6379/head
invario 2025-05-28 12:28:09 -04:00 committed by GitHub
parent 16137b6ebf
commit 06b9db9077
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 73 additions and 70 deletions

View File

@ -21,25 +21,25 @@
#domain keyfile certfile cafile fullchain #domain keyfile certfile cafile fullchain
localcopy_deploy() { localcopy_deploy() {
_cdomain="$1" _cdomain="$1"
_ckey="$2" _ckey="$2"
_ccert="$3" _ccert="$3"
_cca="$4" _cca="$4"
_cfullchain="$5" _cfullchain="$5"
_debug _cdomain "$_cdomain" _debug _cdomain "$_cdomain"
_debug _ckey "$_ckey" _debug _ckey "$_ckey"
_debug _ccert "$_ccert" _debug _ccert "$_ccert"
_debug _cca "$_cca" _debug _cca "$_cca"
_debug _cfullchain "$_cfullchain" _debug _cfullchain "$_cfullchain"
_getdeployconf DEPLOY_LOCALCOPY_CERTIFICATE _getdeployconf DEPLOY_LOCALCOPY_CERTIFICATE
_getdeployconf DEPLOY_LOCALCOPY_CERTKEY _getdeployconf DEPLOY_LOCALCOPY_CERTKEY
_getdeployconf DEPLOY_LOCALCOPY_FULLCHAIN _getdeployconf DEPLOY_LOCALCOPY_FULLCHAIN
_getdeployconf DEPLOY_LOCALCOPY_CA _getdeployconf DEPLOY_LOCALCOPY_CA
_getdeployconf DEPLOY_LOCALCOPY_RELOADCMD _getdeployconf DEPLOY_LOCALCOPY_RELOADCMD
if [ "$DEPLOY_LOCALCOPY_CERTIFICATE" ]; then if [ "$DEPLOY_LOCALCOPY_CERTIFICATE" ]; then
_info "Copying certificate" _info "Copying certificate"
_debug "Copying $_ccert to $DEPLOY_LOCALCOPY_CERTIFICATE" _debug "Copying $_ccert to $DEPLOY_LOCALCOPY_CERTIFICATE"
eval "cp $_ccert $DEPLOY_LOCALCOPY_CERTIFICATE" eval "cp $_ccert $DEPLOY_LOCALCOPY_CERTIFICATE"
@ -47,9 +47,10 @@ localcopy_deploy() {
_err "Failed to copy certificate, aborting." _err "Failed to copy certificate, aborting."
return 1; return 1;
fi; fi;
fi; _savedeployconf DEPLOY_LOCALCOPY_CERTIFICATE "$DEPLOY_LOCALCOPY_CERTIFICATE"
fi;
if [ "$DEPLOY_LOCALCOPY_CERTKEY" ]; then if [ "$DEPLOY_LOCALCOPY_CERTKEY" ]; then
_info "Copying certificate key" _info "Copying certificate key"
_debug "Copying $_ckey to $DEPLOY_LOCALCOPY_CERTKEY" _debug "Copying $_ckey to $DEPLOY_LOCALCOPY_CERTKEY"
eval "cp $_ckey $DEPLOY_LOCALCOPY_CERTKEY" eval "cp $_ckey $DEPLOY_LOCALCOPY_CERTKEY"
@ -57,10 +58,10 @@ localcopy_deploy() {
_err "Failed to copy certificate key, aborting." _err "Failed to copy certificate key, aborting."
return 1; return 1;
fi; fi;
_savedeployconf DEPLOY_LOCALCOPY_CERTKEY "$DEPLOY_LOCALCOPY_CERTKEY"
fi;
fi; if [ "$DEPLOY_LOCALCOPY_FULLCHAIN" ]; then
if [ "$DEPLOY_LOCALCOPY_FULLCHAIN" ]; then
_info "Copying fullchain" _info "Copying fullchain"
_debug "Copying $_cfullchain to $DEPLOY_LOCALCOPY_FULLCHAIN" _debug "Copying $_cfullchain to $DEPLOY_LOCALCOPY_FULLCHAIN"
eval "cp $_cfullchain $DEPLOY_LOCALCOPY_FULLCHAIN" eval "cp $_cfullchain $DEPLOY_LOCALCOPY_FULLCHAIN"
@ -68,10 +69,10 @@ localcopy_deploy() {
_err "Failed to copy fullchain, aborting." _err "Failed to copy fullchain, aborting."
return 1; return 1;
fi; fi;
_savedeployconf DEPLOY_LOCALCOPY_FULLCHAIN "$DEPLOY_LOCALCOPY_FULLCHAIN"
fi;
fi; if [ "$DEPLOY_LOCALCOPY_CA" ]; then
if [ "$DEPLOY_LOCALCOPY_CA" ]; then
_info "Copying CA" _info "Copying CA"
_debug "Copying $_cca to $DEPLOY_LOCALCOPY_CA" _debug "Copying $_cca to $DEPLOY_LOCALCOPY_CA"
eval "cp $_cca $DEPLOY_LOCALCOPY_CA" eval "cp $_cca $DEPLOY_LOCALCOPY_CA"
@ -79,24 +80,26 @@ localcopy_deploy() {
_err "Failed to copy CA, aborting." _err "Failed to copy CA, aborting."
return 1; return 1;
fi; fi;
fi; _savedeployconf DEPLOY_LOCALCOPY_CA "$DEPLOY_LOCALCOPY_CA"
fi;
_reload=$DEPLOY_LOCALCOPY_RELOADCMD _reload=$DEPLOY_LOCALCOPY_RELOADCMD
_debug "Running reloadcmd $_reload"
if [ -z "$_reload" ]; then
_info "Reloadcmd not provided, skipping."
else
_info "Reloading"
if eval $_reload; then if eval $_reload; then
_info "Reload successful." _info "Reload successful."
_savedeployconf DEPLOY_LOCALCOPY_RELOADCMD "$DEPLOY_LOCALCOPY_RELOADCMD" "base64"
else else
_err "Reload failed." _err "Reload failed."
fi; fi;
fi;
# Save configuration _info "$(__green "'localcopy' deploy success")"
_savedeployconf DEPLOY_LOCALCOPY_CERTIFICATE "$DEPLOY_LOCALCOPY_CERTIFICATE" return 0
_savedeployconf DEPLOY_LOCALCOPY_CERTKEY "$DEPLOY_LOCALCOPY_CERTKEY"
_savedeployconf DEPLOY_LOCALCOPY_FULLCHAIN "$DEPLOY_LOCALCOPY_FULLCHAIN"
_savedeployconf DEPLOY_LOCALCOPY_CA "$DEPLOY_LOCALCOPY_CA"
_savedeployconf DEPLOY_LOCALCOPY_RELOADCMD "$DEPLOY_LOCALCOPY_RELOADCMD" "base64"
_info "$(__green ""localcopy" deploy success")"
return 0
} }