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
83b49b23
Unverified
Commit
83b49b23
authored
Oct 03, 2021
by
Bjarne Saltbaek
Committed by
GitHub
Oct 03, 2021
Browse files
Merge branch 'acmesh-official:master' into dns_cpanel
parents
8339b881
ae25931b
Changes
2
Show whitespace changes
Inline
Side-by-side
.github/workflows/Windows.yml
View file @
83b49b23
...
@@ -54,7 +54,7 @@ jobs:
...
@@ -54,7 +54,7 @@ jobs:
-
name
:
Set ENV
-
name
:
Set ENV
shell
:
cmd
shell
:
cmd
run
:
|
run
:
|
echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin >> %GITHUB_ENV%
echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin
;%PATH%
>> %GITHUB_ENV%
-
name
:
Check ENV
-
name
:
Check ENV
shell
:
cmd
shell
:
cmd
run
:
|
run
:
|
...
...
acme.sh
View file @
83b49b23
...
@@ -4934,7 +4934,9 @@ $_authorizations_map"
...
@@ -4934,7 +4934,9 @@ $_authorizations_map"
echo
"
$response
"
>
"
$CERT_PATH
"
echo
"
$response
"
>
"
$CERT_PATH
"
_split_cert_chain
"
$CERT_PATH
"
"
$CERT_FULLCHAIN_PATH
"
"
$CA_CERT_PATH
"
_split_cert_chain
"
$CERT_PATH
"
"
$CERT_FULLCHAIN_PATH
"
"
$CA_CERT_PATH
"
if
[
-z
"
$_preferred_chain
"
]
;
then
_preferred_chain
=
$(
_readcaconf DEFAULT_PREFERRED_CHAIN
)
fi
if
[
"
$_preferred_chain
"
]
&&
[
-f
"
$CERT_FULLCHAIN_PATH
"
]
;
then
if
[
"
$_preferred_chain
"
]
&&
[
-f
"
$CERT_FULLCHAIN_PATH
"
]
;
then
if
[
"
$DEBUG
"
]
;
then
if
[
"
$DEBUG
"
]
;
then
_debug
"default chain issuers: "
"
$(
_get_chain_issuers
"
$CERT_FULLCHAIN_PATH
"
)
"
_debug
"default chain issuers: "
"
$(
_get_chain_issuers
"
$CERT_FULLCHAIN_PATH
"
)
"
...
@@ -6547,6 +6549,8 @@ Commands:
...
@@ -6547,6 +6549,8 @@ Commands:
--deactivate Deactivate the domain authz, professional use.
--deactivate Deactivate the domain authz, professional use.
--set-default-ca Used with '--server', Set the default CA to use.
--set-default-ca Used with '--server', Set the default CA to use.
See:
$_SERVER_WIKI
See:
$_SERVER_WIKI
--set-default-chain Set the default preferred chain for a CA.
See:
$_PREFERRED_CHAIN_WIKI
Parameters:
Parameters:
...
@@ -6833,6 +6837,18 @@ setdefaultca() {
...
@@ -6833,6 +6837,18 @@ setdefaultca() {
_info
"Changed default CA to:
$(
__green
"
$ACME_DIRECTORY
"
)
"
_info
"Changed default CA to:
$(
__green
"
$ACME_DIRECTORY
"
)
"
}
}
#preferred-chain
setdefaultchain
()
{
_initpath
_preferred_chain
=
"
$1
"
if
[
-z
"
$_preferred_chain
"
]
;
then
_err
"Please give a '--preferred-chain value' value."
return
1
fi
mkdir
-p
"
$CA_DIR
"
_savecaconf
"DEFAULT_PREFERRED_CHAIN"
"
$_preferred_chain
"
}
_process
()
{
_process
()
{
_CMD
=
""
_CMD
=
""
_domain
=
""
_domain
=
""
...
@@ -6984,6 +7000,9 @@ _process() {
...
@@ -6984,6 +7000,9 @@ _process() {
--set-default-ca
)
--set-default-ca
)
_CMD
=
"setdefaultca"
_CMD
=
"setdefaultca"
;;
;;
--set-default-chain
)
_CMD
=
"setdefaultchain"
;;
-d
|
--domain
)
-d
|
--domain
)
_dvalue
=
"
$2
"
_dvalue
=
"
$2
"
...
@@ -7514,6 +7533,9 @@ _process() {
...
@@ -7514,6 +7533,9 @@ _process() {
setdefaultca
)
setdefaultca
)
setdefaultca
setdefaultca
;;
;;
setdefaultchain
)
setdefaultchain
"
$_preferred_chain
"
;;
*
)
*
)
if
[
"
$_CMD
"
]
;
then
if
[
"
$_CMD
"
]
;
then
_err
"Invalid command:
$_CMD
"
_err
"Invalid command:
$_CMD
"
...
...
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