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
4e3f328a
Unverified
Commit
4e3f328a
authored
Aug 04, 2021
by
neil
Committed by
GitHub
Aug 04, 2021
Browse files
Merge pull request #3644 from acmesh-official/dev
sync
parents
d84da5bd
8380ca2f
Changes
2
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
4e3f328a
#!/usr/bin/env sh
#!/usr/bin/env sh
VER
=
3.0.
0
VER=3.0.
1
PROJECT_NAME="acme.sh"
PROJECT_NAME="acme.sh"
...
@@ -3161,14 +3161,14 @@ _checkConf() {
...
@@ -3161,14 +3161,14 @@ _checkConf() {
FOUND_REAL_NGINX_CONF="$2"
FOUND_REAL_NGINX_CONF="$2"
return 0
return 0
fi
fi
if
cat
"
$2
"
|
tr
"
\t
"
" "
|
grep
"^ *include
*.
*;"
>
/dev/null
;
then
if cat "$2" | tr "\t" " " | grep "^ *include *;" >/dev/null; then
_debug "Try include files"
_debug "Try include files"
for
included
in
$(
cat
"
$2
"
|
tr
"
\t
"
" "
|
grep
"^ *include
*.
*;"
|
sed
"s/include //"
|
tr
-d
" ;"
)
;
do
for included in $(cat "$2" | tr "\t" " " | grep "^ *include *;" | sed "s/include //" | tr -d " ;"); do
_debug "check included $included"
_debug "check included $included"
if ! _startswith "$included" "/" && _exists dirname; then
if ! _startswith "$included" "/" && _exists dirname; then
_relpath="$(dirname "$_c_file")"
_relpath="$(dirname "$_c_file")"
_debug "_relpath" "$_relpath"
_debug "_relpath" "$_relpath"
included
=
"
$_relpath
/included"
included="$_relpath/
$
included"
fi
fi
if _checkConf "$1" "$included"; then
if _checkConf "$1" "$included"; then
return 0
return 0
...
@@ -4207,7 +4207,7 @@ issue() {
...
@@ -4207,7 +4207,7 @@ issue() {
if [ -z "$_ACME_IS_RENEW" ]; then
if [ -z "$_ACME_IS_RENEW" ]; then
_initpath "$_main_domain" "$_key_length"
_initpath "$_main_domain" "$_key_length"
mkdir -p "$DOMAIN_PATH"
mkdir -p "$DOMAIN_PATH"
el
se
el
if ! _hasfield "$_web_roots" "$W_DNS"; then
Le_OrderFinalize=""
Le_OrderFinalize=""
Le_LinkOrder=""
Le_LinkOrder=""
Le_LinkCert=""
Le_LinkCert=""
...
...
dnsapi/dns_aws.sh
View file @
4e3f328a
...
@@ -32,7 +32,7 @@ dns_aws_add() {
...
@@ -32,7 +32,7 @@ dns_aws_add() {
if
[
-z
"
$AWS_ACCESS_KEY_ID
"
]
||
[
-z
"
$AWS_SECRET_ACCESS_KEY
"
]
;
then
if
[
-z
"
$AWS_ACCESS_KEY_ID
"
]
||
[
-z
"
$AWS_SECRET_ACCESS_KEY
"
]
;
then
AWS_ACCESS_KEY_ID
=
""
AWS_ACCESS_KEY_ID
=
""
AWS_SECRET_ACCESS_KEY
=
""
AWS_SECRET_ACCESS_KEY
=
""
_err
"You haven't specifed the aws route53 api key id and and api key secret yet."
_err
"You haven't specif
i
ed the aws route53 api key id and and api key secret yet."
_err
"Please create your key and try again. see
$(
__green
$AWS_WIKI
)
"
_err
"Please create your key and try again. see
$(
__green
$AWS_WIKI
)
"
return
1
return
1
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