Merge pull request #502 from Neilpang/dev

Dev
This commit is contained in:
neil authored and GitHub committed 2017-01-03 19:35:31 +08:00
commit 3ef817ebc2
2 files changed
+13 -10

No files matched your search

+2
View File
@@ -160,6 +160,8 @@ acme.sh --installcert -d example.com \
Only the domain is required, all the other parameters are optional.
The ownership and permission info of existing files are preserved. You may want to precreate the files to have defined ownership and permission.
Install/copy the issued cert/key to the production Apache or Nginx path.
The cert will be `renewed every **60** days by default` (which is configurable). Once the cert is renewed, the Apache/Nginx service will be restarted automatically by the command: `service apache2 restart` or `service nginx restart`.
+11 -10
View File
@@ -2075,6 +2075,17 @@ _clearupwebbroot() {
_on_before_issue() {
_debug _on_before_issue
#run pre hook
if [ "$Le_PreHook" ]; then
_info "Run pre hook:'$Le_PreHook'"
if ! (
cd "$DOMAIN_PATH" && eval "$Le_PreHook"
); then
_err "Error when run pre hook."
return 1
fi
fi
if _hasfield "$Le_Webroot" "$NO_VALUE"; then
if ! _exists "nc"; then
_err "Please install netcat(nc) tools first."
@@ -2142,16 +2153,6 @@ _on_before_issue() {
usingApache=""
fi
#run pre hook
if [ "$Le_PreHook" ]; then
_info "Run pre hook:'$Le_PreHook'"
if ! (
cd "$DOMAIN_PATH" && eval "$Le_PreHook"
); then
_err "Error when run pre hook."
return 1
fi
fi
}
_on_issue_err() {
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.