Default WELLKNOWN location is now `/var/www/letsencrypt`

With this change private and public files are now separated by default.

diff --git a/.gitignore b/.gitignore
index 26422e13961f97fc06a8d0a2851344b4d22c0b45..abc69ff099b6be98838160a95233504cd39fdc47 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ hook.sh
 certs/*
 archive/*
 accounts/*
-.acme-challenges/*

diff --git a/CHANGELOG b/CHANGELOG
index 6d4948087618db2f1d8576d0b125120fa8896517..f15cb698be77d1021e876f974d0708e4792c033a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ This file contains a log of major changes in letsencrypt.sh
 - Location of certs directory is now configurable via CERTDIR config variable
 - signcsr command now also outputs chain certificate
 - Location of account-key(s) changed
+- Default WELLKNOWN location is now `/var/www/letsencrypt`
 
 ## Added
 - Added option to add CSR-flag indicating OCSP stapling to be mandatory

diff --git a/docs/examples/config b/docs/examples/config
index f7009e1df854a08b030e40bbc55451cb1364d8ca..cba3755063d577794a44f1fa45693e5b370d0086 100644 (file)
--- a/docs/examples/config
+++ b/docs/examples/config
@@ -42,8 +42,8 @@
 # Directory for account keys and registration information
 #ACCOUNTDIR="${BASEDIR}/accounts"
 
-# Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: $BASEDIR/.acme-challenges)
-#WELLKNOWN="${BASEDIR}/.acme-challenges"
+# Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/letsencrypt)
+#WELLKNOWN="/var/www/letsencrypt"
 
 # Default keysize for private keys (default: 4096)
 #KEYSIZE="4096"

diff --git a/letsencrypt.sh b/letsencrypt.sh
index 4b670c03275ec15a0430bf24ac77bd156e40e41e..65dd9da8f39de203c1fbd60acdd1db69d0bf7568 100755 (executable)
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@ -181,7 +181,7 @@ load_config() {
 
   [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
   [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
-  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/.acme-challenges"
+  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/letsencrypt"
   [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
 
   [[ -n "${PARAM_HOOK:-}" ]] && HOOK="${PARAM_HOOK}"