Merge branch 'master' into dns-mijn-host

letsencrypt/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
-## 5.1.4
+## 5.1.5
 
 - Add mijn.host DNS support
 
+## 5.1.4
+
+- Drop Google Domains support (the new operator Squarespace has no ACME support)
+
 ## 5.1.3
 
 - Add godaddy.com DNS support

letsencrypt/DOCS.md

@@ -104,8 +104,6 @@ dnsmadeeasy_secret_key: ''
 duckdns_token: ''
 dynu_auth_token: ''
 google_creds: ''
-google_domains_access_token: ''
-google_domains_zone: ''
 hetzner_api_token: ''
 gehirn_api_token: ''
 gehirn_api_secret: ''
@@ -404,30 +402,6 @@ You can find additional information regarding the required permissions in the "c
 
 </details>
 
-<details>
-  <summary>Google Domains DNS challenge</summary>
-
-  ```yaml
-  email: your.email@example.com
-  domains:
-    - subdomain.home-assistant.io
-  certfile: fullchain.pem
-  keyfile: privkey.pem
-  challenge: dns
-  dns:
-    provider: dns-google-domains
-    google_domains_access_token: XXXX
-    google_domains_zone: home-assistant.io
-  ```
-
-To obtain the ACME DNS API token follow the instructions here:
-
-<https://support.google.com/domains/answer/7630973#acme_dns>
-
-The optional `google_domains_zone` option specifies the domain name registered with Google Domains.  If not specified, it is guessed based on the public suffix list.
-
-</details>
-
 <details>
   <summary>Infomaniak DNS challenge</summary>
 

letsencrypt/Dockerfile

@@ -15,7 +15,6 @@ ARG \
     CERTBOT_DNS_DUCKDNS_VERSION \
     CERTBOT_DNS_DYNU_VERSION \
     CERTBOT_DNS_EASYDNS_VERSION \
-    CERTBOT_DNS_GOOGLE_DOMAINS_VERSION \
     CERTBOT_DNS_HE_VERSION \
     CERTBOT_DNS_HETZNER_VERSION \
     CERTBOT_DNS_INFOMANIAK_VERSION \
@@ -66,7 +65,6 @@ RUN \
         certbot-dns-gehirn==${CERTBOT_VERSION} \
         certbot-dns-godaddy==${CERTBOT_DNS_GODADDY_VERSION} \
         certbot-dns-google==${CERTBOT_VERSION} \
-        certbot-dns-google-domains==${CERTBOT_DNS_GOOGLE_DOMAINS_VERSION} \
         certbot-dns-hetzner==${CERTBOT_DNS_HETZNER_VERSION} \
         certbot-dns-infomaniak==${CERTBOT_DNS_INFOMANIAK_VERSION} \
         certbot-dns-joker==${CERTBOT_DNS_JOKER_VERSION} \

letsencrypt/build.yaml

@@ -27,7 +27,6 @@ args:
   CERTBOT_DNS_MIJN_HOST_VERSION: 0.0.3
   CERTBOT_DNS_NAMECHEAP_VERSION: 1.0.0
   CERTBOT_DNS_NORISNETWORK_VERSION: 0.2.1
-  CERTBOT_DNS_GOOGLE_DOMAINS_VERSION: 0.1.11
   CERTBOT_DNS_TRANSIP_VERSION: 0.5.2
   CERTBOT_DNS_PORKBUN_VERSION: 0.8.0
   CERTBOT_DNS_WEBSUPPORT_VERSION: 2.0.1

letsencrypt/config.yaml

@@ -68,8 +68,6 @@ schema:
     godaddy_secret: str?
     godaddy_key: str?
     google_creds: str?
-    google_domains_access_token: str?
-    google_domains_zone: str?
     hetzner_api_token: str?
     infomaniak_api_token: str?
     linode_key: str?

letsencrypt/rootfs/etc/cont-init.d/file-structure.sh

@@ -64,7 +64,6 @@ echo -e "dns_desec_token = $(bashio::config 'dns.desec_token')\n" \
       "dns_inwx_username = $(bashio::config 'dns.inwx_username')\n" \
       "dns_inwx_password = $(bashio::config 'dns.inwx_password')\n" \
       "dns_inwx_shared_secret = $(bashio::config 'dns.inwx_shared_secret')\n" \
-      "dns_google_domains_access_token = $(bashio::config 'dns.google_domains_access_token')\n" \
       "dns_cloudns_auth_password = $(bashio::config 'dns.cloudns_auth_password')\n" \
       "dns_dreamhost_baseurl = $(bashio::config 'dns.dreamhost_baseurl')\n" \
       "dns_dreamhost_api_key = $(bashio::config 'dns.dreamhost_api_key')\n" \
@@ -77,10 +76,6 @@ echo -e "dns_desec_token = $(bashio::config 'dns.desec_token')\n" \
       "dns_websupport_identifier = $(bashio::config 'dns.websupport_identifier')\n" \
       "dns_websupport_secret_key = $(bashio::config 'dns.websupport_secret_key')\n" > /data/dnsapikey
 
-if bashio::config.exists 'dns.google_domains_zone'; then
-      echo -e "dns_google_domains_zone = $(bashio::config 'dns.google_domains_zone')\n" >> /data/dnsapikey
-fi
-
 # ClouDNS
 # Only a single non-empty auth option must be in /data/dnsapikey when using ClouDNS to avoid a certbot error
 if bashio::config.exists 'dns.cloudns_auth_id'; then
@@ -114,3 +109,9 @@ fi
 if bashio::config.exists 'keytype'; then
     bashio::addon.option 'keytype'
 fi
+if bashio::config.exists 'dns.google_domains_access_token'; then
+    bashio::addon.option 'dns.google_domains_access_token'
+fi
+if bashio::config.exists 'dns.google_domains_zone'; then
+    bashio::addon.option 'dns.google_domains_zone'
+fi

letsencrypt/rootfs/etc/services.d/lets-encrypt/run

@@ -56,10 +56,6 @@ elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-google" ]; then
       bashio::log.info "Google Credentials File doesnt exists in folder share."
     fi
     PROVIDER_ARGUMENTS+=("--${DNS_PROVIDER}" "--${DNS_PROVIDER}-credentials" "/data/${GOOGLE_CREDS}")
-#Google Domains
-elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-google-domains" ]; then
-    bashio::config.require 'dns.google_domains_access_token'
-    PROVIDER_ARGUMENTS+=("--authenticator" "${DNS_PROVIDER}" "--${DNS_PROVIDER}-credentials" "/data/dnsapikey" "--${DNS_PROVIDER}-propagation-seconds" "${PROPAGATION_SECONDS}")
 #Namecheap
 elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-namecheap" ]; then
     bashio::config.require 'dns.namecheap_username'