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
01ba8216
Commit
01ba8216
authored
Jan 07, 2016
by
neil
Browse files
fix error message for cron job
parent
8abd3e90
Changes
1
Hide whitespace changes
Inline
Side-by-side
le.sh
View file @
01ba8216
...
@@ -209,10 +209,10 @@ _setopt() {
...
@@ -209,10 +209,10 @@ _setopt() {
_startserver
()
{
_startserver
()
{
content
=
"
$1
"
content
=
"
$1
"
while
true
;
do
while
true
;
do
if
[
-z
"
$DEBUG
"
]
;
then
if
[
"
$DEBUG
"
]
;
then
echo
-e
-n
"HTTP/1.1 200 OK
\r\n\r\n
$content
"
| nc
-q
1
-l
-p
80
>
/dev/null
else
echo
-e
-n
"HTTP/1.1 200 OK
\r\n\r\n
$content
"
| nc
-q
1
-l
-p
80
echo
-e
-n
"HTTP/1.1 200 OK
\r\n\r\n
$content
"
| nc
-q
1
-l
-p
80
else
echo
-e
-n
"HTTP/1.1 200 OK
\r\n\r\n
$content
"
| nc
-q
1
-l
-p
80 2>&1
>
/dev/null
fi
fi
done
done
}
}
...
@@ -225,6 +225,7 @@ _stopserver() {
...
@@ -225,6 +225,7 @@ _stopserver() {
killall
-s
9 nc 2>&1
killall
-s
9 nc 2>&1
else
else
kill
-s
9
$pid
2>&1
>
/dev/null
kill
-s
9
$pid
2>&1
>
/dev/null
wait
$pid
2>/dev/null
killall
-s
9 nc 2>&1
>
/dev/null
killall
-s
9 nc 2>&1
>
/dev/null
fi
fi
fi
fi
...
@@ -415,7 +416,7 @@ issue() {
...
@@ -415,7 +416,7 @@ issue() {
_send_signed_request
$uri
"{
\"
resource
\"
:
\"
challenge
\"
,
\"
keyAuthorization
\"
:
\"
$keyauthorization
\"
}"
_send_signed_request
$uri
"{
\"
resource
\"
:
\"
challenge
\"
,
\"
keyAuthorization
\"
:
\"
$keyauthorization
\"
}"
if
[
!
-z
"
$code
"
]
&&
[
!
"
$code
"
==
'202'
]
;
then
if
[
!
-z
"
$code
"
]
&&
[
!
"
$code
"
==
'202'
]
;
then
_err
"
c
hallenge error:
$
d
"
_err
"
$d
:C
hallenge error:
$
resource
"
_stopserver
$serverproc
_stopserver
$serverproc
return
1
return
1
fi
fi
...
@@ -426,7 +427,7 @@ issue() {
...
@@ -426,7 +427,7 @@ issue() {
_debug
"checking"
_debug
"checking"
if
!
_get
$uri
;
then
if
!
_get
$uri
;
then
_err
"Verify error:
$resource
"
_err
"
$d
:
Verify error:
$resource
"
_stopserver
$serverproc
_stopserver
$serverproc
return
1
return
1
fi
fi
...
@@ -439,7 +440,7 @@ issue() {
...
@@ -439,7 +440,7 @@ issue() {
if
[
"
$status
"
==
"invalid"
]
;
then
if
[
"
$status
"
==
"invalid"
]
;
then
error
=
$(
echo
$response
| egrep
-o
'"error":{[^}]*}'
|
grep
-o
'"detail":"[^"]*"'
|
cut
-d
'"'
-f
4
)
error
=
$(
echo
$response
| egrep
-o
'"error":{[^}]*}'
|
grep
-o
'"detail":"[^"]*"'
|
cut
-d
'"'
-f
4
)
_err
"Verify error:
$error
"
_err
"
$d
:
Verify error:
$error
"
_stopserver
$serverproc
_stopserver
$serverproc
return
1
;
return
1
;
fi
fi
...
@@ -447,7 +448,7 @@ issue() {
...
@@ -447,7 +448,7 @@ issue() {
if
[
"
$status
"
==
"pending"
]
;
then
if
[
"
$status
"
==
"pending"
]
;
then
_info
"Pending"
_info
"Pending"
else
else
_err
"Verify error:
$response
"
_err
"
$d
:
Verify error:
$response
"
_stopserver
$serverproc
_stopserver
$serverproc
return
1
return
1
fi
fi
...
@@ -485,7 +486,7 @@ issue() {
...
@@ -485,7 +486,7 @@ issue() {
if
[
-z
"
$Le_LinkCert
"
]
;
then
if
[
-z
"
$Le_LinkCert
"
]
;
then
response
=
"
$(
echo
$response
|
base64
-d
)
"
response
=
"
$(
echo
$response
|
base64
-d
)
"
_
info
"Sign failed:
$(
echo
"
$response
"
|
grep
-o
'"detail":"[^"]*"'
)
"
_
err
"Sign failed:
$(
echo
"
$response
"
|
grep
-o
'"detail":"[^"]*"'
)
"
return
1
return
1
fi
fi
...
@@ -633,12 +634,17 @@ install() {
...
@@ -633,12 +634,17 @@ install() {
fi
fi
_info
"Installing cron job"
_info
"Installing cron job"
if
command
-v
sudo
>
/dev/null
;
then
if
[
"
$(
sudo
-n
uptime
2>&1|grep
"load"
|wc
-l
)
"
!=
"0"
]
;
then
SUDO
=
sudo
fi
fi
if
!
crontab
-l
|
grep
'le.sh renewAll'
;
then
if
!
crontab
-l
|
grep
'le.sh renewAll'
;
then
crontab
-l
|
{
cat
;
echo
"0 0 * * *
le.sh renewA
ll"
;
}
| crontab -
crontab
-l
|
{
cat
;
echo
"0 0 * * *
$SUDO
le renewAll > /dev/nu
ll"
;
}
| crontab -
if
command
-v
crond
>
/dev/null
;
then
if
command
-v
crond
>
/dev/null
;
then
service crond reload
2
>/dev/null
service crond reload
>
/dev/null
else
else
service cron reload
2
>/dev/null
service cron reload
>
/dev/null
fi
fi
fi
fi
...
...
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