Browse Source

Merge pull request #2694 from Neilpang/dev

sync
pull/2470/head 2.8.5
neil 5 years ago
committed by GitHub
parent
commit
d4dad58b0d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      acme.sh
  2. 2
      dnsapi/dns_gcloud.sh

5
acme.sh

@ -1,6 +1,6 @@
#!/usr/bin/env sh #!/usr/bin/env sh
VER=2.8.4
VER=2.8.5
PROJECT_NAME="acme.sh" PROJECT_NAME="acme.sh"
@ -2415,7 +2415,7 @@ __initHome() {
if [ -z "$ACCOUNT_CONF_PATH" ]; then if [ -z "$ACCOUNT_CONF_PATH" ]; then
ACCOUNT_CONF_PATH="$_DEFAULT_ACCOUNT_CONF_PATH" ACCOUNT_CONF_PATH="$_DEFAULT_ACCOUNT_CONF_PATH"
fi fi
_debug3 ACCOUNT_CONF_PATH "$ACCOUNT_CONF_PATH"
DEFAULT_LOG_FILE="$LE_CONFIG_HOME/$PROJECT_NAME.log" DEFAULT_LOG_FILE="$LE_CONFIG_HOME/$PROJECT_NAME.log"
DEFAULT_CA_HOME="$LE_CONFIG_HOME/ca" DEFAULT_CA_HOME="$LE_CONFIG_HOME/ca"
@ -6303,6 +6303,7 @@ _installOnline() {
chmod +x $PROJECT_ENTRY chmod +x $PROJECT_ENTRY
if ./$PROJECT_ENTRY install "$_nocron" "" "$_noprofile"; then if ./$PROJECT_ENTRY install "$_nocron" "" "$_noprofile"; then
_info "Install success!" _info "Install success!"
_initpath
_saveaccountconf "UPGRADE_HASH" "$(_getMasterHash)" _saveaccountconf "UPGRADE_HASH" "$(_getMasterHash)"
fi fi

2
dnsapi/dns_gcloud.sh

@ -131,7 +131,7 @@ _dns_gcloud_find_zone() {
filter="$filter$part. " filter="$filter$part. "
part="$(echo "$part" | sed 's/[^.]*\.*//')" part="$(echo "$part" | sed 's/[^.]*\.*//')"
done done
filter="$filter)"
filter="$filter) AND visibility=public"
_debug filter "$filter" _debug filter "$filter"
# List domains and find the zone with the deepest sub-domain (in case of some levels of delegation) # List domains and find the zone with the deepest sub-domain (in case of some levels of delegation)

Loading…
Cancel
Save