plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-26 15:02:03 +00:00
Code Issues Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
neil 2016-06-18 12:28:23 +08:00
parent cc17973113
commit 5aa146a53f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
acme.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env sh #!/usr/bin/env sh
VER=2.2.7 VER=2.2.8
PROJECT_NAME="acme.sh" PROJECT_NAME="acme.sh"
@ -375,9 +375,12 @@ _signcsr() {
csr="$2" csr="$2"
conf="$3" conf="$3"
cert="$4" cert="$4"
_debug "_signcsr"
openssl x509 -req -days 365 -in "$csr" -signkey "$key" -extensions v3_req -extfile "$conf" -out "$cert" _msg="$(openssl x509 -req -days 365 -in "$csr" -signkey "$key" -extensions v3_req -extfile "$conf" -out "$cert" 2>&1)"
_ret="$?"
_debug "$_msg"
return $_ret
} }
_ss() { _ss() {
@ -869,7 +872,7 @@ _stopserver(){
fi fi
_get "http://localhost:$Le_HTTPPort" >/dev/null 2>&1 _get "http://localhost:$Le_HTTPPort" >/dev/null 2>&1
_get "http://localhost:$Le_TLSPort" >/dev/null 2>&1 _get "https://localhost:$Le_TLSPort" >/dev/null 2>&1
} }
@ -910,9 +913,9 @@ _starttlsserver() {
#start openssl #start openssl
if [ "$DEBUG" ] && [ "$DEBUG" -ge "2" ] ; then if [ "$DEBUG" ] && [ "$DEBUG" -ge "2" ] ; then
(printf "HTTP/1.1 200 OK\r\n\r\n$content" | openssl s_server -cert "$TLS_CERT" -key "$TLS_KEY" -accept $port -tlsextdebug ) & (printf "HTTP/1.1 200 OK\r\n\r\n$content" | openssl s_server -cert "$TLS_CERT" -key "$TLS_KEY" -accept $port -naccept 1 -tlsextdebug ) &
else else
(printf "HTTP/1.1 200 OK\r\n\r\n$content" | openssl s_server -cert "$TLS_CERT" -key "$TLS_KEY" -accept $port >/dev/null 2>&1) & (printf "HTTP/1.1 200 OK\r\n\r\n$content" | openssl s_server -cert "$TLS_CERT" -key "$TLS_KEY" -accept $port -naccept 1 >/dev/null 2>&1) &
fi fi
serverproc="$!" serverproc="$!"
@ -1791,7 +1794,7 @@ renew() {
fi fi
_initpath $Le_Domain _initpath $Le_Domain
_info "Renew: $Le_Domain"
if [ ! -f "$DOMAIN_CONF" ] ; then if [ ! -f "$DOMAIN_CONF" ] ; then
_info "$Le_Domain is not a issued domain, skip." _info "$Le_Domain is not a issued domain, skip."
return 0; return 0;
@ -1820,7 +1823,6 @@ renewAll() {
for d in $(ls -F ${CERT_HOME}/ | grep [^.].*[.].*/$ ) ; do for d in $(ls -F ${CERT_HOME}/ | grep [^.].*[.].*/$ ) ; do
d=$(echo $d | cut -d '/' -f 1) d=$(echo $d | cut -d '/' -f 1)
( (
_info "Renew: $d"
renew "$d" renew "$d"
) )
rc="$?" rc="$?"