From 6e3da9e0438d26722623fdfb838b8e00cfeb36dc Mon Sep 17 00:00:00 2001
From: Joona Hoikkala <joona@kuori.org>
Date: Mon, 7 Dec 2015 11:07:31 +0200
Subject: [PATCH] Configurable directory path for challenge configuration file

---
 letsencrypt-apache/letsencrypt_apache/configurator.py | 3 +++
 letsencrypt-apache/letsencrypt_apache/constants.py    | 6 ++++--
 letsencrypt-apache/letsencrypt_apache/tls_sni_01.py   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py
index ce0714668..642a46696 100644
--- a/letsencrypt-apache/letsencrypt_apache/configurator.py
+++ b/letsencrypt-apache/letsencrypt_apache/configurator.py
@@ -100,6 +100,9 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             help="Apache server root directory.")
         add("vhost-root", default=constants.os_constant("vhost_root"),
             help="Apache server VirtualHost configuration root")
+        add("challenge-location",
+            default=constants.os_constant("challenge_location"),
+            help="Directory path for challenge configuration.")
         le_util.add_deprecated_argument(add, "init-script", 1)
 
     def __init__(self, *args, **kwargs):
diff --git a/letsencrypt-apache/letsencrypt_apache/constants.py b/letsencrypt-apache/letsencrypt_apache/constants.py
index cf6351f22..0fd9a25dc 100644
--- a/letsencrypt-apache/letsencrypt_apache/constants.py
+++ b/letsencrypt-apache/letsencrypt_apache/constants.py
@@ -10,7 +10,8 @@ CLI_DEFAULTS_DEBIAN = dict(
     enmod="a2enmod",
     dismod="a2dismod",
     le_vhost_ext="-le-ssl.conf",
-    handle_mods=True
+    handle_mods=True,
+    challenge_location="/etc/apache2"
 )
 CLI_DEFAULTS_CENTOS = dict(
     server_root="/etc/httpd",
@@ -19,7 +20,8 @@ CLI_DEFAULTS_CENTOS = dict(
     enmod=None,
     dismod=None,
     le_vhost_ext="-le-ssl.conf",
-    handle_mods=False
+    handle_mods=False,
+    challenge_location="/etc/httpd/conf.d"
 )
 CLI_DEFAULTS = {
     "debian": CLI_DEFAULTS_DEBIAN,
diff --git a/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py b/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
index 4284e240c..2049eb574 100644
--- a/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
+++ b/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
@@ -50,7 +50,7 @@ class ApacheTlsSni01(common.TLSSNI01):
         super(ApacheTlsSni01, self).__init__(*args, **kwargs)
 
         self.challenge_conf = os.path.join(
-            self.configurator.conf("server-root"),
+            self.configurator.conf("challenge-location"),
             "le_tls_sni_01_cert_challenge.conf")
 
     def perform(self):