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
47d9a9cf
Commit
47d9a9cf
authored
Mar 22, 2017
by
neil
Committed by
GitHub
Mar 22, 2017
Browse files
Merge pull request #738 from Neilpang/dev
Dev
parents
7ebecf38
7f25205a
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
47d9a9cf
...
@@ -1483,7 +1483,9 @@ _inithttp() {
...
@@ -1483,7 +1483,9 @@ _inithttp() {
_ACME_CURL
=
"
$_ACME_CURL
--trace-ascii
$_CURL_DUMP
"
_ACME_CURL
=
"
$_ACME_CURL
--trace-ascii
$_CURL_DUMP
"
fi
fi
if
[
"
$CA_BUNDLE
"
]
;
then
if
[
"
$CA_PATH
"
]
;
then
_ACME_CURL
=
"
$_ACME_CURL
--capath
$CA_PATH
"
elif
[
"
$CA_BUNDLE
"
]
;
then
_ACME_CURL
=
"
$_ACME_CURL
--cacert
$CA_BUNDLE
"
_ACME_CURL
=
"
$_ACME_CURL
--cacert
$CA_BUNDLE
"
fi
fi
...
@@ -1494,8 +1496,10 @@ _inithttp() {
...
@@ -1494,8 +1496,10 @@ _inithttp() {
if
[
"
$DEBUG
"
]
&&
[
"
$DEBUG
"
-ge
"2"
]
;
then
if
[
"
$DEBUG
"
]
&&
[
"
$DEBUG
"
-ge
"2"
]
;
then
_ACME_WGET
=
"
$_ACME_WGET
-d "
_ACME_WGET
=
"
$_ACME_WGET
-d "
fi
fi
if
[
"
$CA_BUNDLE
"
]
;
then
if
[
"
$CA_PATH
"
]
;
then
_ACME_WGET
=
"
$_ACME_WGET
--ca-certificate
$CA_BUNDLE
"
_ACME_WGET
=
"
$_ACME_WGET
--ca-directory=
$CA_PATH
"
elif
[
"
$CA_BUNDLE
"
]
;
then
_ACME_WGET
=
"
$_ACME_WGET
--ca-certificate=
$CA_BUNDLE
"
fi
fi
fi
fi
...
@@ -3707,6 +3711,12 @@ issue() {
...
@@ -3707,6 +3711,12 @@ issue() {
_clearaccountconf
"CA_BUNDLE"
_clearaccountconf
"CA_BUNDLE"
fi
fi
if
[
"
$CA_PATH
"
]
;
then
_saveaccountconf CA_PATH
"
$CA_PATH
"
else
_clearaccountconf
"CA_PATH"
fi
if
[
"
$HTTPS_INSECURE
"
]
;
then
if
[
"
$HTTPS_INSECURE
"
]
;
then
_saveaccountconf HTTPS_INSECURE
"
$HTTPS_INSECURE
"
_saveaccountconf HTTPS_INSECURE
"
$HTTPS_INSECURE
"
else
else
...
@@ -4922,6 +4932,7 @@ _process() {
...
@@ -4922,6 +4932,7 @@ _process() {
_stopRenewOnError
=
""
_stopRenewOnError
=
""
#_insecure=""
#_insecure=""
_ca_bundle
=
""
_ca_bundle
=
""
_ca_path
=
""
_nocron
=
""
_nocron
=
""
_ecc
=
""
_ecc
=
""
_csr
=
""
_csr
=
""
...
@@ -5236,6 +5247,11 @@ _process() {
...
@@ -5236,6 +5247,11 @@ _process() {
CA_BUNDLE
=
"
$_ca_bundle
"
CA_BUNDLE
=
"
$_ca_bundle
"
shift
shift
;;
;;
--ca-path
)
_ca_path
=
"
$2
"
CA_PATH
=
"
$_ca_path
"
shift
;;
--nocron
)
--nocron
)
_nocron
=
"1"
_nocron
=
"1"
;;
;;
...
...
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