Merge pull request #591 from Neilpang/dev

Dev
This commit is contained in:
neil 2017-02-06 21:38:15 +08:00 committed by GitHub
commit 981077516b
2 changed files with 17 additions and 1 deletions

View File

@ -55,6 +55,7 @@ https://github.com/Neilpang/acmetest
- Standalone mode
- Apache mode
- DNS mode
- [Stateless mode](https://github.com/Neilpang/acme.sh/wiki/Stateless-Mode)
# 1. How to install

17
acme.sh
View File

@ -41,6 +41,8 @@ NO_VALUE="no"
W_TLS="tls"
MODE_STATELESS="stateless"
STATE_VERIFIED="verified_ok"
BEGIN_CSR="-----BEGIN CERTIFICATE REQUEST-----"
@ -63,6 +65,8 @@ _DEBUG_WIKI="https://github.com/Neilpang/acme.sh/wiki/How-to-debug-acme.sh"
_PREPARE_LINK="https://github.com/Neilpang/acme.sh/wiki/Install-preparations"
_STATELESS_WIKI="https://github.com/Neilpang/acme.sh/wiki/Stateless-Mode"
__INTERACTIVE=""
if [ -t 1 ]; then
__INTERACTIVE="1"
@ -2973,7 +2977,9 @@ issue() {
serverproc="$!"
sleep 1
_debug serverproc "$serverproc"
elif [ "$_currentRoot" = "$MODE_STATELESS" ]; then
_info "Stateless mode for domain:$d"
_sleep 1
else
if [ "$_currentRoot" = "apache" ]; then
wellknown_path="$ACME_DIR"
@ -4258,6 +4264,7 @@ Parameters:
--webroot, -w /path/to/webroot Specifies the web root folder for web root mode.
--standalone Use standalone mode.
--stateless Use stateless mode, see: $_STATELESS_WIKI
--tls Use standalone tls mode.
--apache Use apache mode.
--dns [dns_cf|dns_dp|dns_cx|/path/to/api/file] Use dns mode or dns api.
@ -4563,6 +4570,14 @@ _process() {
_webroot="$_webroot,$wvalue"
fi
;;
--stateless)
wvalue="$MODE_STATELESS"
if [ -z "$_webroot" ]; then
_webroot="$wvalue"
else
_webroot="$_webroot,$wvalue"
fi
;;
--local-address)
lvalue="$2"
_local_address="$_local_address$lvalue,"