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
0f954c20
Commit
0f954c20
authored
Feb 06, 2017
by
neil
Committed by
GitHub
Feb 06, 2017
Browse files
Merge pull request #587 from Neilpang/dev
Dev
parents
b4325026
d6edff31
Changes
2
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
0f954c20
...
...
@@ -33,7 +33,6 @@ install:
fi
script
:
-
echo "TEST_LOCAL=$TEST_LOCAL"
-
echo "NGROK_TOKEN=$(echo "$NGROK_TOKEN" | wc -c)"
-
command -V openssl && openssl version
-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
...
...
@@ -44,8 +43,8 @@ script:
-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck **/*.sh && echo "shellcheck OK" ; fi
-
cd ..
-
git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
-
if [ "$TRAVIS_OS_NAME" = "linux" -a "$NGROK_TOKEN" ]; then sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi
-
if [ "$TRAVIS_OS_NAME" = "osx" -a "$NGROK_TOKEN" ]; then sudo NGROK_TOKEN="$NGROK_TOKEN" OPENSSL_BIN="$OPENSSL_BIN" ./letest.sh ; fi
-
if [ "$TRAVIS_OS_NAME" = "linux" -a "$NGROK_TOKEN" ]; then sudo
TEST_LOCAL="$TEST_LOCAL"
NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi
-
if [ "$TRAVIS_OS_NAME" = "osx" -a "$NGROK_TOKEN" ]; then sudo
TEST_LOCAL="$TEST_LOCAL"
NGROK_TOKEN="$NGROK_TOKEN" OPENSSL_BIN="$OPENSSL_BIN" ./letest.sh ; fi
matrix
:
...
...
acme.sh
View file @
0f954c20
...
...
@@ -1687,7 +1687,7 @@ _startserver() {
fi
if
[
"
$Le_Listen_V4$Le_Listen_V6$ncaddr
"
]
;
then
if
!
_contains
"
$nchelp
"
"
OpenBSD
"
;
then
if
!
_contains
"
$nchelp
"
"
-4
"
;
then
_err
"The nc doesn't support '-4', '-6' or local-address, please install 'netcat-openbsd' and try again."
_err
"See
$(
__green
$_PREPARE_LINK
)
"
return
1
...
...
@@ -3906,12 +3906,7 @@ _detect_profile() {
_initconf
()
{
_initpath
if
[
!
-f
"
$ACCOUNT_CONF_PATH
"
]
;
then
echo
"#ACCOUNT_CONF_PATH=xxxx
#ACCOUNT_EMAIL=aaa@example.com # the account email used to register account.
#ACCOUNT_KEY_PATH=
\"
/path/to/account.key
\"
#CERT_HOME=
\"
/path/to/cert/home
\"
echo
"
#LOG_FILE=
\"
$DEFAULT_LOG_FILE
\"
#LOG_LEVEL=1
...
...
@@ -3919,12 +3914,6 @@ _initconf() {
#AUTO_UPGRADE=
\"
1
\"
#NO_TIMESTAMP=1
#OPENSSL_BIN=openssl
#USER_AGENT=
\"
$USER_AGENT
\"
#USER_PATH=
"
>
"
$ACCOUNT_CONF_PATH
"
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