Merge remote-tracking branch 'github/letsencrypt/master' into test-embed-lens

letsencrypt-apache/letsencrypt_apache/dvsni.py

@@ -20,7 +20,7 @@ class ApacheDvsni(common.Dvsni):
         larger array. ApacheDvsni is capable of solving many challenges
         at once which causes an indexing issue within ApacheConfigurator
         who must return all responses in order.  Imagine ApacheConfigurator
-        maintaining state about where all of the SimpleHTTP Challenges,
+        maintaining state about where all of the http-01 Challenges,
         Dvsni Challenges belong in the response array.  This is an optional
         utility.
 

letsencrypt-apache/letsencrypt_apache/parser.py

@@ -122,7 +122,7 @@ class ApacheParser(object):
         """
         try:
             proc = subprocess.Popen(
-                [ctl, "-D", "DUMP_RUN_CFG"],
+                [ctl, "-t", "-D", "DUMP_RUN_CFG"],
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
             stdout, stderr = proc.communicate()