Browse Source

Merge pull request #3644 from acmesh-official/dev

sync
master
neil 1 year ago committed by GitHub
parent
commit
4e3f328a02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      acme.sh
  2. 2
      dnsapi/dns_aws.sh

10
acme.sh

@ -1,6 +1,6 @@
#!/usr/bin/env sh
VER=3.0.0
VER=3.0.1
PROJECT_NAME="acme.sh"
@ -3161,14 +3161,14 @@ _checkConf() {
FOUND_REAL_NGINX_CONF="$2"
return 0
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"
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"
if ! _startswith "$included" "/" && _exists dirname; then
_relpath="$(dirname "$_c_file")"
_debug "_relpath" "$_relpath"
included="$_relpath/included"
included="$_relpath/$included"
fi
if _checkConf "$1" "$included"; then
return 0
@ -4207,7 +4207,7 @@ issue() {
if [ -z "$_ACME_IS_RENEW" ]; then
_initpath "$_main_domain" "$_key_length"
mkdir -p "$DOMAIN_PATH"
else
elif ! _hasfield "$_web_roots" "$W_DNS"; then
Le_OrderFinalize=""
Le_LinkOrder=""
Le_LinkCert=""

2
dnsapi/dns_aws.sh

@ -32,7 +32,7 @@ dns_aws_add() {
if [ -z "$AWS_ACCESS_KEY_ID" ] || [ -z "$AWS_SECRET_ACCESS_KEY" ]; then
AWS_ACCESS_KEY_ID=""
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 specified the aws route53 api key id and and api key secret yet."
_err "Please create your key and try again. see $(__green $AWS_WIKI)"
return 1
fi

Loading…
Cancel
Save