use presets for some CAs instead of requiring full urls

This commit is contained in:
Lukas Schauer
2020-09-14 16:37:10 +02:00
parent 42a0fc9a5e
commit a9a64c9fd0
2 changed files with 16 additions and 3 deletions

View File

@@ -312,8 +312,12 @@ load_config() {
done done
fi fi
# Preset
CA_ZEROSSL=""
CA_LETSENCRYPT="https://acme-v02.api.letsencrypt.org/directory"
# Default values # Default values
CA="https://acme-v02.api.letsencrypt.org/directory" CA="letsencrypt"
OLDCA= OLDCA=
CERTDIR= CERTDIR=
ALPNCERTDIR= ALPNCERTDIR=
@@ -415,6 +419,13 @@ load_config() {
# Check BASEDIR and set default variables # Check BASEDIR and set default variables
[[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}" [[ -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 if [[ -z "${OLDCA}" ]] && [[ "${CA}" = "https://acme-v02.api.letsencrypt.org/directory" ]]; then
OLDCA="https://acme-v01.api.letsencrypt.org/directory" OLDCA="https://acme-v01.api.letsencrypt.org/directory"
fi fi

View File

@@ -21,8 +21,10 @@
# default: <unset> # default: <unset>
#IP_VERSION= #IP_VERSION=
# Path to certificate authority (default: https://acme-v02.api.letsencrypt.org/directory) # URL to certificate authority or internal preset
#CA="https://acme-v02.api.letsencrypt.org/directory" # Presets: letsencrypt, zerossl
# default: letsencrypt
#CA="letsencrypt"
# Path to old certificate authority # Path to old certificate authority
# Set this value to your old CA value when upgrading from ACMEv1 to ACMEv2 under a different endpoint. # Set this value to your old CA value when upgrading from ACMEv1 to ACMEv2 under a different endpoint.