From 7b05d573f2d08eff5f62490935ca69429b93b67f Mon Sep 17 00:00:00 2001
From: Joona Hoikkala <joona@kuori.org>
Date: Tue, 22 Dec 2015 10:32:18 +0200
Subject: [PATCH] Abstracted the -D DUMP_RUN_CFG command to use os specific
 one, defined in constants

---
 letsencrypt-apache/letsencrypt_apache/constants.py | 5 ++++-
 letsencrypt-apache/letsencrypt_apache/parser.py    | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/constants.py b/letsencrypt-apache/letsencrypt_apache/constants.py
index 712e7f240..a859f57d4 100644
--- a/letsencrypt-apache/letsencrypt_apache/constants.py
+++ b/letsencrypt-apache/letsencrypt_apache/constants.py
@@ -7,7 +7,8 @@ CLI_DEFAULTS_DEBIAN = dict(
     server_root="/etc/apache2",
     vhost_root="/etc/apache2/sites-available",
     ctl="apache2ctl",
-    version_cmd='apache2ctl -v',
+    version_cmd="apache2ctl -v",
+    define_cmd="apache2ctl -t -D DUMP_RUN_CFG",
     enmod="a2enmod",
     dismod="a2dismod",
     le_vhost_ext="-le-ssl.conf",
@@ -20,6 +21,7 @@ CLI_DEFAULTS_CENTOS = dict(
     vhost_root="/etc/httpd/conf.d",
     ctl="apachectl",
     version_cmd="apachectl -v",
+    define_cmd="apachectl -t -D DUMP_RUN_CFG",
     enmod=None,
     dismod=None,
     le_vhost_ext="-le-ssl.conf",
@@ -32,6 +34,7 @@ CLI_DEFAULTS_GENTOO = dict(
     vhost_root="/etc/apache2/vhosts.d",
     ctl="apache2ctl",
     version_cmd="/usr/sbin/apache2 -v",
+    define_cmd="/usr/sbin/apache2 -t -D DUMP_RUN_CFG",
     enmod=None,
     dismod=None,
     le_vhost_ext="-le-ssl.conf",
diff --git a/letsencrypt-apache/letsencrypt_apache/parser.py b/letsencrypt-apache/letsencrypt_apache/parser.py
index c9ab438ca..19eb566c4 100644
--- a/letsencrypt-apache/letsencrypt_apache/parser.py
+++ b/letsencrypt-apache/letsencrypt_apache/parser.py
@@ -8,6 +8,7 @@ import subprocess
 
 from letsencrypt import errors
 
+from letsencrypt_apache import constants
 
 logger = logging.getLogger(__name__)
 
@@ -108,7 +109,7 @@ class ApacheParser(object):
         for match in matches:
             if match.count("=") > 1:
                 logger.error("Unexpected number of equal signs in "
-                             "apache2ctl -D DUMP_RUN_CFG")
+                             "runtime config dump.")
                 raise errors.PluginError(
                     "Error parsing Apache runtime variables")
             parts = match.partition("=")
@@ -124,7 +125,7 @@ class ApacheParser(object):
         """
         try:
             proc = subprocess.Popen(
-                [ctl, "-t", "-D", "DUMP_RUN_CFG"],
+                constants.os_constant("define_cmd").split(" "),
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
             stdout, stderr = proc.communicate()