From: Daniel Molkentin <dmolkentin@suse.com>
Date: Thu, 17 Sep 2020 15:09:09 +0000 (+0200)
Subject: add more CAs, now that support for CA presets is implemented
X-Git-Tag: v0.7.0~24
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=60cb678e3bff1e028922847e08aa9fb111d770ee;p=thirdparty%2Fdehydrated.git

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 4ea552e..d686453 100644
--- 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 dad9f9f..caf53c8 100755
--- 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 99e033e..e148b18 100644
--- 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"