add more CAs, now that support for CA presets is implemented

- letsencrypt-test (LE staging CA)
- buypass (verified to work with the new json parsing, see #653)
- buypass-test analogously

diff --git a/CHANGELOG b/CHANGELOG
index 4ea552e2771ff6742f0ae42039390efb8ef8d1ce..d686453c86f1c8866b8f994e9a4c22230f520d33 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ This file contains a log of major changes in dehydrated
 ## Added
 - Support for external account bindings
 - Special support for ZeroSSL
+- Support presets for some CAs instead of requiring URLs
 
 ## Fixed
 - No more silent failures on broken hook-scripts

diff --git a/dehydrated b/dehydrated
index dad9f9fdaa52f69b2f56da6101e8bcfbbe4ca7ee..caf53c8cee21f88046de8bdde7946e34311641a6 100755 (executable)
--- a/dehydrated
+++ b/dehydrated
@@ -320,6 +320,9 @@ load_config() {
   # Preset
   CA_ZEROSSL="https://acme.zerossl.com/v2/DV90"
   CA_LETSENCRYPT="https://acme-v02.api.letsencrypt.org/directory"
+  CA_LETSENCRYPT_TEST="https://acme-staging-v02.api.letsencrypt.org/directory"
+  CA_BUYPASS="https://api.buypass.com/acme/directory"
+  CA_BUYPASS_TEST="https://api.test4.buypass.no/acme/directory"
 
   # Default values
   CA="letsencrypt"
@@ -432,8 +435,14 @@ load_config() {
   # Preset CAs
   if [ "${CA}" = "letsencrypt" ]; then
     CA="${CA_LETSENCRYPT}"
+  elif [ "${CA}" = "letsencrypt-test" ]; then
+    CA="${CA_LETSENCRYPT_TEST}"
   elif [ "${CA}" = "zerossl" ]; then
     CA="${CA_ZEROSSL}"
+  elif [ "${CA}" = "buypass" ]; then
+    CA="${CA_BUYPASS}"
+  elif [ "${CA}" = "buypass-test" ]; then
+    CA="${CA_BUYPASS_TEST}"
   fi
 
   if [[ -z "${OLDCA}" ]] && [[ "${CA}" = "https://acme-v02.api.letsencrypt.org/directory" ]]; then

diff --git a/docs/examples/config b/docs/examples/config
index 99e033e38fc33a209d374a6b3bc5c87bc49426c9..e148b18fd580c6612e3ff8f61d9e27520df4c07f 100644 (file)
--- a/docs/examples/config
+++ b/docs/examples/config
@@ -22,7 +22,7 @@
 #IP_VERSION=
 
 # URL to certificate authority or internal preset
-# Presets: letsencrypt, zerossl
+# Presets: letsencrypt, letsencrypt-test, zerossl, buypass, buypass-test
 # default: letsencrypt
 #CA="letsencrypt"