Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
5aa146a5
Commit
5aa146a5
authored
Jun 18, 2016
by
neil
Browse files
fix bug
parent
cc179731
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
5aa146a5
#!/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() {
...
@@ -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(){
...
@@ -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
"http
s
://localhost:
$Le_TLSPort
"
>
/dev/null 2>&1
}
}
...
@@ -910,9 +913,9 @@ _starttlsserver() {
...
@@ -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() {
...
@@ -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
;
...
@@ -1819,8 +1822,7 @@ renewAll() {
...
@@ -1819,8 +1822,7 @@ renewAll() {
_ret
=
"0"
_ret
=
"0"
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
=
"
$?
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment