yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-05-10 16:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 850d7ba9ebfbbfb4502abe8b1e3ae3288cfbc25c into 56d6079c4aedf748d844e9ab657c4d564f45e1ba

Browse Source
This commit is contained in:
Sam Batschelet 2018-09-09 13:24:14 +00:00 committed by GitHub
commit 6332e034d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
acme.sh
View File

@ -4714,19 +4714,7 @@ _installcert() {
fi fi
if [ "$_reload_cmd" ]; then if [ "$_reload_cmd" ]; then
_info "Run reload cmd: $_reload_cmd" _eval_reload_cmd "$_reload_cmd"
if (
export CERT_PATH
export CERT_KEY_PATH
export CA_CERT_PATH
export CERT_FULLCHAIN_PATH
export Le_Domain
cd "$DOMAIN_PATH" && eval "$_reload_cmd"
); then
_info "$(__green "Reload success")"
else
_err "Reload error for :$Le_Domain"
fi
fi fi
} }
@ -5389,6 +5377,12 @@ _uninstallalias() {
} }
cron() { cron() {
_reload_cmd="$1"
if [ "$_reload_cmd" = "$NO_VALUE" ]; then
_reload_cmd=""
fi
export IN_CRON=1 export IN_CRON=1
_initpath _initpath
_info "$(__green "===Starting cron===")" _info "$(__green "===Starting cron===")"
@ -5410,11 +5404,32 @@ cron() {
fi fi
renewAll renewAll
_ret="$?" _ret="$?"
if [ "$_reload_cmd" ]; then
_eval_reload_cmd "$_reload_cmd"
fi
IN_CRON="" IN_CRON=""
_info "$(__green "===End cron===")" _info "$(__green "===End cron===")"
exit $_ret exit $_ret
} }
_eval_reload_cmd() {
_reload_cmd="$1"
_info "Run reload cmd: $_reload_cmd"
if (
export CERT_PATH
export CERT_KEY_PATH
export CA_CERT_PATH
export CERT_FULLCHAIN_PATH
export Le_Domain
cd "$DOMAIN_PATH" && eval "$_reload_cmd"
); then
_info "$(__green "Reload success")"
else
_err "Reload error for :$Le_Domain"
fi
}
version() { version() {
echo "$PROJECT" echo "$PROJECT"
echo "v$VER" echo "v$VER"
@ -6169,7 +6184,7 @@ _process() {
;; ;;
installcronjob) installcronjob "$_confighome" ;; installcronjob) installcronjob "$_confighome" ;;
uninstallcronjob) uninstallcronjob ;; uninstallcronjob) uninstallcronjob ;;
cron) cron ;; cron) cron "$_reloadcmd" ;;
toPkcs) toPkcs)
toPkcs "$_domain" "$_password" "$_ecc" toPkcs "$_domain" "$_password" "$_ecc"
;; ;;