use new acme-v02 endpoint by default

diff --git a/CHANGELOG b/CHANGELOG
index b9d8e15206e0bfd4814cfa90f30bf09ae543f017..91b66ce9151406ac0db53b956f1c13a183a3bce9 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ This file contains a log of major changes in dehydrated
 
 ## [x.x.x] - xxxx-xx-xx
 ## Changed
-- ??
+- Use new ACME v2 endpoint by default
 
 ## Added
 - ??

diff --git a/dehydrated b/dehydrated
index fd0368253fcdb764e264b76b046a20909cd6b498..4ff367ee11570130fda5a5be4278207061de5973 100755 (executable)
--- a/dehydrated
+++ b/dehydrated
@@ -118,7 +118,7 @@ load_config() {
   fi
 
   # Default values
-  CA="https://acme-v01.api.letsencrypt.org/directory"
+  CA="https://acme-v02.api.letsencrypt.org/directory"
   OLDCA=
   CERTDIR=
   ACCOUNTDIR=
@@ -218,6 +218,10 @@ load_config() {
   # Check BASEDIR and set default variables
   [[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}"
 
+  if [[ -z "${OLDCA}" ]] && [[ "${CA}" = "https://acme-v02.api.letsencrypt.org/directory" ]]; then
+    OLDCA="https://acme-v01.api.letsencrypt.org/directory"
+  fi
+
   # Create new account directory or symlink to account directory from old CA
   CAHASH="$(echo "${CA}" | urlbase64)"
   [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"