Fix apache logs dir for centos

Author: DanCld

certbot-apache/certbot_apache/configurator.py

@@ -98,6 +98,8 @@ def add_parser_arguments(cls, add):
             help="Apache server root directory.")
         add("vhost-root", default=constants.os_constant("vhost_root"),
             help="Apache server VirtualHost configuration root")
+        add("logs-root", default=constants.os_constant("logs_root"),
+            help="Apache server logs directory")
         add("challenge-location",
             default=constants.os_constant("challenge_location"),
             help="Directory path for challenge configuration.")
@@ -1425,13 +1427,14 @@ def _get_redirect_config_str(self, ssl_vhost):
                 "RewriteEngine On\n"
                 "RewriteRule %s\n"
                 "\n"
-                "ErrorLog /var/log/apache2/redirect.error.log\n"
+                "ErrorLog %s/redirect.error.log\n"
                 "LogLevel warn\n"
                 "</VirtualHost>\n"
                 % (" ".join(str(addr) for
                             addr in self._get_proposed_addrs(ssl_vhost)),
                    servername, serveralias,
-                   " ".join(rewrite_rule_args)))
+                   " ".join(rewrite_rule_args),
+                   self.conf("logs-root") ))
 
     def _write_out_redirect(self, ssl_vhost, text):
         # This is the default name

certbot-apache/certbot_apache/constants.py

@@ -6,6 +6,7 @@
     server_root="/etc/apache2",
     vhost_root="/etc/apache2/sites-available",
     vhost_files="*",
+    logs_root="/var/log/apache2",
     version_cmd=['apache2ctl', '-v'],
     define_cmd=['apache2ctl', '-t', '-D', 'DUMP_RUN_CFG'],
     restart_cmd=['apache2ctl', 'graceful'],
@@ -23,6 +24,7 @@
     server_root="/etc/apache2",
     vhost_root="/etc/apache2/sites-available",
     vhost_files="*",
+    logs_root="/var/log/apache2",
     version_cmd=['apache2ctl', '-v'],
     define_cmd=['apache2ctl', '-t', '-D', 'DUMP_RUN_CFG'],
     restart_cmd=['apache2ctl', 'graceful'],
@@ -40,6 +42,7 @@
     server_root="/etc/httpd",
     vhost_root="/etc/httpd/conf.d",
     vhost_files="*.conf",
+    logs_root="/var/log/httpd",
     version_cmd=['apachectl', '-v'],
     define_cmd=['apachectl', '-t', '-D', 'DUMP_RUN_CFG'],
     restart_cmd=['apachectl', 'graceful'],
@@ -57,6 +60,7 @@
     server_root="/etc/apache2",
     vhost_root="/etc/apache2/vhosts.d",
     vhost_files="*.conf",
+    logs_root="/var/log/apache2",
     version_cmd=['/usr/sbin/apache2', '-v'],
     define_cmd=['apache2ctl', 'virtualhosts'],
     restart_cmd=['apache2ctl', 'graceful'],
@@ -74,6 +78,7 @@
     server_root="/etc/apache2",
     vhost_root="/etc/apache2/other",
     vhost_files="*.conf",
+    logs_root="/var/log/apache2",
     version_cmd=['/usr/sbin/httpd', '-v'],
     define_cmd=['/usr/sbin/httpd', '-t', '-D', 'DUMP_RUN_CFG'],
     restart_cmd=['apachectl', 'graceful'],
@@ -91,6 +96,7 @@
     server_root="/etc/apache2",
     vhost_root="/etc/apache2/vhosts.d",
     vhost_files="*.conf",
+    logs_root="/var/log/apache2",
     version_cmd=['apache2ctl', '-v'],
     define_cmd=['apache2ctl', '-t', '-D', 'DUMP_RUN_CFG'],
     restart_cmd=['apache2ctl', 'graceful'],