make default PRIVATE_KEY and WELLKNOWN relative to BASEDIR, even if BASEDIR is overridden in config.sh; basic checks on BASEDIR

This commit is contained in:
Axel Burri
2015-12-12 15:41:34 +01:00
parent 1cd2eb2551
commit 1e33cfe52b
2 changed files with 26 additions and 9 deletions

View File

@@ -16,14 +16,26 @@ CA="https://acme-v01.api.letsencrypt.org/directory"
LICENSE="https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
HOOK=
RENEW_DAYS="14"
PRIVATE_KEY=${BASEDIR}/private_key.pem
PRIVATE_KEY=
KEYSIZE="4096"
WELLKNOWN="${SCRIPTDIR}/.acme-challenges"
WELLKNOWN=
PRIVATE_KEY_RENEW="no"
OPENSSL_CNF="$(openssl version -d | cut -d'"' -f2)/openssl.cnf"
ROOTCERT="lets-encrypt-x1-cross-signed.pem"
CONTACT_EMAIL=
set_defaults() {
# Default config variables depending on BASEDIR
if [[ -z "${PRIVATE_KEY}" ]]; then
PRIVATE_KEY="${BASEDIR}/private_key.pem"
fi
if [[ -z "${WELLKNOWN}" ]]; then
WELLKNOWN="${BASEDIR}/.acme-challenges"
fi
LOCKFILE="${BASEDIR}/lock"
}
init_system() {
# Check for config in various locations
if [[ -z "${CONFIG:-}" ]]; then
@@ -52,9 +64,14 @@ init_system() {
# Remove slash from end of BASEDIR. Mostly for cleaner outputs, doesn't change functionality.
BASEDIR="${BASEDIR%%/}"
# Lockfile handling (prevents concurrent access)
LOCKFILE="${BASEDIR}/lock"
# Check BASEDIR and set default variables
if [[ ! -d "${BASEDIR}" ]]; then
echo "ERROR: BASEDIR does not exist: ${BASEDIR}"
exit 1
fi
set_defaults
# Lockfile handling (prevents concurrent access)
set -o noclobber
if ! { date > "${LOCKFILE}"; } 2>/dev/null; then
echo " + ERROR: Lock file '${LOCKFILE}' present, aborting." >&2