Merge pull request #1013 from Neilpang/dev

Dev
This commit is contained in:
neil 2017-09-05 20:49:07 +08:00 committed by GitHub
commit 5e864ea3b5
2 changed files with 11 additions and 5 deletions

View File

@ -1814,7 +1814,12 @@ _send_signed_request() {
_CACHED_NONCE="$(echo "$responseHeaders" | grep "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)" _CACHED_NONCE="$(echo "$responseHeaders" | grep "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)"
if _contains "$response" "JWS has invalid anti-replay nonce"; then _body="$response"
if [ "$needbase64" ]; then
_body="$(echo "$_body" | _dbase64)"
fi
_debug3 _body "$_body"
if _contains "$_body" "JWS has invalid anti-replay nonce"; then
_info "It seems the CA server is busy now, let's wait and retry." _info "It seems the CA server is busy now, let's wait and retry."
_request_retry_times=$(_math "$_request_retry_times" + 1) _request_retry_times=$(_math "$_request_retry_times" + 1)
_sleep 5 _sleep 5

View File

@ -6,6 +6,8 @@ Here are the scripts to deploy the certs/key to the server/services.
## 1. Deploy the certs to your cpanel host. ## 1. Deploy the certs to your cpanel host.
If you want to deploy using cpanel UAPI see 7.
(cpanel deploy hook is not finished yet, this is just an example.) (cpanel deploy hook is not finished yet, this is just an example.)
@ -81,14 +83,13 @@ acme.sh --deploy -d ftp.example.com --deploy-hook exim4
acme.sh --deploy -d ftp.example.com --deploy-hook keychain acme.sh --deploy -d ftp.example.com --deploy-hook keychain
``` ```
## 7. Deploy to cpanel host. ## 7. Deploy to cpanel host using UAPI
This hook is using UAPI and works in cPanel & WHM version 56 or newer.
``` ```
acme.sh --deploy -d example.com --deploy-hook cpanel_uapi acme.sh --deploy -d example.com --deploy-hook cpanel_uapi
``` ```
DEPLOY_CPANEL_USER is required only if you run the script as root and it should contain cpanel username.
If you are login as root, please specify the username to deploy cert to:
```sh ```sh
export DEPLOY_CPANEL_USER=username export DEPLOY_CPANEL_USER=username
acme.sh --deploy -d example.com --deploy-hook cpanel_uapi acme.sh --deploy -d example.com --deploy-hook cpanel_uapi