Config parameter for configuration location that != server root

letsencrypt-apache/letsencrypt_apache/configurator.py

@@ -98,6 +98,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             help="SSL vhost configuration extension.")
         add("server-root", default=constants.os_constant("server_root"),
             help="Apache server root directory.")
+        add("config-root", default=constants.os_constant("config_root"),
+            help="Apache server configuration root")
         le_util.add_deprecated_argument(add, "init-script", 1)
 
     def __init__(self, *args, **kwargs):
@@ -146,7 +148,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         self.config_test()
 
         self.parser = parser.ApacheParser(
-            self.aug, self.conf("server-root"), self.conf("ctl"))
+            self.aug, self.conf("config-root"), self.conf("ctl"))
         # Check for errors in parsing files with Augeas
         self.check_parsing_errors("httpd.aug")
 

letsencrypt-apache/letsencrypt_apache/constants.py

@@ -5,6 +5,7 @@ from letsencrypt import le_util
 
 CLI_DEFAULTS_DEBIAN = dict(
     server_root="/etc/apache2",
+    config_root="/etc/apache2",
     ctl="apache2ctl",
     enmod="a2enmod",
     dismod="a2dismod",
@@ -13,6 +14,7 @@ CLI_DEFAULTS_DEBIAN = dict(
 )
 CLI_DEFAULTS_CENTOS = dict(
     server_root="/etc/httpd",
+    config_root="/etc/httpd/conf.d",
     ctl="apachectl",
     enmod=None,
     dismod=None,