starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-03-18 07:13:48 +01:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

Merge pull request #40 from digint/no_scriptdir

Browse Source 
Don't use SCRIPTDIR
This commit is contained in:
Lukas Schauer
2015-12-14 00:57:43 +01:00
parent 06feebe171 1e33cfe52b
commit 706859010c
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config.sh.example
View File

@@ -19,14 +19,14 @@
# Path to license agreement (default: https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf)
#LICENSE="https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
# Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: $SCRIPTDIR/.acme-challenges)
#WELLKNOWN="${SCRIPTDIR}/.acme-challenges"
# Base directory for account key, generated certificates and list of domains (default: $SCRIPTDIR -- uses config directory if undefined)
#BASEDIR=$SCRIPTDIR
# Location of private account key
#PRIVATE_KEY=${BASEDIR}/private_key.pem
# Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: $BASEDIR/.acme-challenges)
#WELLKNOWN="${BASEDIR}/.acme-challenges"
# Location of private account key (default: $BASEDIR/private_key.pem)
#PRIVATE_KEY="${BASEDIR}/private_key.pem"
# Default keysize for private keys (default: 4096)
#KEYSIZE="4096"

35
letsencrypt.sh
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
@@ -127,8 +144,6 @@ init_system() {
if [[ -e "${BASEDIR}/domains.txt" ]]; then
DOMAINS_TXT="${BASEDIR}/domains.txt"
elif [[ -e "${SCRIPTDIR}/domains.txt" ]]; then
DOMAINS_TXT="${SCRIPTDIR}/domains.txt"
else
echo "You have to create a domains.txt file listing the domains you want certificates for. Have a look at domains.txt.example."
exit 1
@@ -350,14 +365,10 @@ sign_domain() {
_openssl x509 -text < "${crt_path}"
# Create fullchain.pem
if [[ -e "${BASEDIR}/certs/${ROOTCERT}" ]] || [[ -e "${SCRIPTDIR}/certs/${ROOTCERT}" ]]; then
if [[ -e "${BASEDIR}/certs/${ROOTCERT}" ]]; then
echo " + Creating fullchain.pem..."
cat "${crt_path}" > "${BASEDIR}/certs/${domain}/fullchain-${timestamp}.pem"
if [[ -e "${BASEDIR}/certs/${ROOTCERT}" ]]; then
cat "${BASEDIR}/certs/${ROOTCERT}" >> "${BASEDIR}/certs/${domain}/fullchain-${timestamp}.pem"
else
cat "${SCRIPTDIR}/certs/${ROOTCERT}" >> "${BASEDIR}/certs/${domain}/fullchain-${timestamp}.pem"
fi
cat "${BASEDIR}/certs/${ROOTCERT}" >> "${BASEDIR}/certs/${domain}/fullchain-${timestamp}.pem"
ln -sf "fullchain-${timestamp}.pem" "${BASEDIR}/certs/${domain}/fullchain.pem"
fi