From 194464b04be70108f9dc8f79aeb58c6b9e10abd1 Mon Sep 17 00:00:00 2001
From: Lukas Schauer <lukas@schauer.so>
Date: Wed, 20 Jul 2016 17:04:25 +0200
Subject: [PATCH] Default WELLKNOWN location is now `/var/www/letsencrypt`

With this change private and public files are now separated by default.
---
 .gitignore           | 1 -
 CHANGELOG            | 1 +
 docs/examples/config | 4 ++--
 letsencrypt.sh       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26422e1..abc69ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ hook.sh
 certs/*
 archive/*
 accounts/*
-.acme-challenges/*
diff --git a/CHANGELOG b/CHANGELOG
index 6d49480..f15cb69 100644
--- 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 f7009e1..cba3755 100644
--- 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 4b670c0..65dd9da 100755
--- 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}"
-- 
2.39.5