From: Lukas Schauer Date: Mon, 14 Sep 2020 14:37:10 +0000 (+0200) Subject: use presets for some CAs instead of requiring full urls X-Git-Tag: v0.7.0~34 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a9a64c9fd085fd174a76150b5785684a36c466ab;p=thirdparty%2Fdehydrated.git use presets for some CAs instead of requiring full urls --- diff --git a/dehydrated b/dehydrated index 75bc5d2..4f05aeb 100755 --- a/dehydrated +++ b/dehydrated @@ -312,8 +312,12 @@ load_config() { done fi + # Preset + CA_ZEROSSL="" + CA_LETSENCRYPT="https://acme-v02.api.letsencrypt.org/directory" + # Default values - CA="https://acme-v02.api.letsencrypt.org/directory" + CA="letsencrypt" OLDCA= CERTDIR= ALPNCERTDIR= @@ -415,6 +419,13 @@ load_config() { # Check BASEDIR and set default variables [[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}" + # Preset CAs + if [ "${CA}" = "letsencrypt" ]; then + CA="{$CA_LETSENCRYPT}" + elif [ "${CA}" = "zerossl" ]; then + CA="${CA_ZEROSSL}" + fi + if [[ -z "${OLDCA}" ]] && [[ "${CA}" = "https://acme-v02.api.letsencrypt.org/directory" ]]; then OLDCA="https://acme-v01.api.letsencrypt.org/directory" fi diff --git a/docs/examples/config b/docs/examples/config index 7b04aa0..99e033e 100644 --- a/docs/examples/config +++ b/docs/examples/config @@ -21,8 +21,10 @@ # default: #IP_VERSION= -# Path to certificate authority (default: https://acme-v02.api.letsencrypt.org/directory) -#CA="https://acme-v02.api.letsencrypt.org/directory" +# URL to certificate authority or internal preset +# Presets: letsencrypt, zerossl +# default: letsencrypt +#CA="letsencrypt" # Path to old certificate authority # Set this value to your old CA value when upgrading from ACMEv1 to ACMEv2 under a different endpoint.