starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-05 08:04:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved Apache and unittests

Browse Source
This commit is contained in:
James Kasten
2015-07-19 19:49:44 -07:00
parent 3206880673
commit 6a8590b4cc
7 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-apache/letsencrypt_apache/configurator.py
+2 -3
View File
@@ -137,8 +137,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.config_test()
self.parser = parser.ApacheParser(
self.aug, self.conf("server-root"), self.mod_ssl_conf,
self.conf("ctl"))
self.aug, self.conf("server-root"), self.conf("ctl"))
# Check for errors in parsing files with Augeas
self.check_parsing_errors("httpd.aug")
@@ -622,7 +621,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"insert_cert_file_path")
self.parser.add_dir(vh_path, "SSLCertificateKeyFile",
"insert_key_file_path")
self.parser.add_dir(vh_path, "Include", self.parser.loc["ssl_options"])
self.parser.add_dir(vh_path, "Include", self.mod_ssl_conf)
def _add_name_vhost_if_necessary(self, vhost):
"""Add NameVirtualHost Directives if necessary for new vhost.