Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
40a3ae04
Commit
40a3ae04
authored
Nov 16, 2016
by
neil
Committed by
GitHub
Nov 16, 2016
Browse files
Merge pull request #393 from Neilpang/dev
Dev
parents
d8b1a8d4
ac26f841
Changes
3
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
40a3ae04
...
...
@@ -15,9 +15,10 @@ addons:
script
:
-
curl -sSL $SHFMT_URL -o ~/shfmt
-
chmod +x ~/shfmt
-
~/shfmt -l -w -i 2 .
-
git diff --exit-code && echo "shfmt OK"
-
shellcheck -V
-
shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK"
-
~/shfmt -l -w -i 2 . && echo "shfmt OK" || git diff --exit-code || (echo "Run shfmt to fix the formatting issues" &&
false
)
-
cd ..
-
curl -sSL https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip -o ngrok-stable-linux-amd64.zip && unzip ngrok-stable-linux-amd64.zip && export NGROK_BIN="$(pwd)/ngrok"
-
git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
...
...
acme.sh
View file @
40a3ae04
...
...
@@ -1325,7 +1325,7 @@ _clear_conf() {
_sdkey
=
"
$2
"
if
[
"
$_c_c_f
"
]
;
then
_conf_data
=
"
$(
cat
"
$_c_c_f
"
)
"
echo
"
$_conf_data
"
|
sed
"s/^
$_sdkey
*=.*
$/
/"
>
"
$_c_c_f
"
echo
"
$_conf_data
"
|
sed
"s/^
$_sdkey
*=.*
$/
/"
>
"
$_c_c_f
"
else
_err
"config file is empty, can not clear"
fi
...
...
@@ -1423,32 +1423,29 @@ _startserver() {
#for centos ncat
if
_contains
"
$nchelp
"
"nmap.org"
;
then
_debug
"Using ncat: nmap.org"
if
!
_exec
"printf
\"
%s
\r\n\r\n
%s
\"
\"
HTTP/1.1 200 OK
\"
\"
$content
\"
|
$_NC
\"
$Le_HTTPPort
\"
>&2"
;
then
_exec_err
return
1
fi
if
[
"
$DEBUG
"
]
;
then
if
printf
"%s
\r\n\r\n
%s"
"HTTP/1.1 200 OK"
"
$content
"
|
$_NC
"
$Le_HTTPPort
"
;
then
return
fi
else
if
printf
"%s
\r\n\r\n
%s"
"HTTP/1.1 200 OK"
"
$content
"
|
$_NC
"
$Le_HTTPPort
"
>
/dev/null 2>&1
;
then
return
fi
_exec_err
fi
_err
"ncat listen error."
return
fi
# while true ; do
if
[
"
$DEBUG
"
]
;
then
if
!
printf
"%s
\r\n\r\n
%s"
"HTTP/1.1 200 OK"
"
$content
"
|
$_NC
-p
"
$Le_HTTPPort
"
;
then
printf
"%s
\r\n\r\n
%s"
"HTTP/1.1 200 OK"
"
$content
"
|
$_NC
"
$Le_HTTPPort
"
fi
else
if
!
printf
"%s
\r\n\r\n
%s"
"HTTP/1.1 200 OK"
"
$content
"
|
$_NC
-p
"
$Le_HTTPPort
"
>
/dev/null 2>&1
;
then
printf
"%s
\r\n\r\n
%s"
"HTTP/1.1 200 OK"
"
$content
"
|
$_NC
"
$Le_HTTPPort
"
>
/dev/null 2>&1
fi
if
!
_exec
"printf
\"
%s
\r\n\r\n
%s
\"
\"
HTTP/1.1 200 OK
\"
\"
$content
\"
|
$_NC
-p
\"
$Le_HTTPPort
\"
>&2"
;
then
_exec
"printf
\"
%s
\r\n\r\n
%s
\"
\"
HTTP/1.1 200 OK
\"
\"
$content
\"
|
$_NC
\"
$Le_HTTPPort
\"
>&2"
fi
if
[
"
$?
"
!=
"0"
]
;
then
_err
"nc listen error."
_exec_err
exit
1
fi
if
[
"
$DEBUG
"
]
;
then
_exec_err
fi
# done
}
...
...
@@ -1781,14 +1778,14 @@ _exec() {
fi
if
[
"
$_EXEC_TEMP_ERR
"
]
;
then
"
$@
"
2>
"
$_EXEC_TEMP_ERR
"
eval
"
$@
2>
>
$_EXEC_TEMP_ERR
"
else
"
$@
"
eval
"
$@
"
fi
}
_exec_err
()
{
[
"
$_EXEC_TEMP_ERR
"
]
&&
_err
"
$(
cat
"
$_EXEC_TEMP_ERR
"
)
"
[
"
$_EXEC_TEMP_ERR
"
]
&&
_err
"
$(
cat
"
$_EXEC_TEMP_ERR
"
)
"
&&
echo
""
>
"
$_EXEC_TEMP_ERR
"
}
_apachePath
()
{
...
...
dnsapi/dns_nsupdate.sh
View file @
40a3ae04
#!/usr/bin/env sh
######## Public functions #####################
#Usage: dns_nsupdate_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
...
...
@@ -22,7 +21,7 @@ EOF
_err
"error updating domain"
return
1
fi
return
0
}
...
...
@@ -45,7 +44,6 @@ EOF
return
0
}
#################### Private functions bellow ##################################
_checkKeyFile
()
{
...
...
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