From 211c2bb33d668c13f8d2e89fb95c88806737d1dd Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 10 Nov 2015 19:41:30 -0600 Subject: [PATCH] Remove SSLCACertificatePath from removed directives SSLCACertificatePath is sometimes important to preserve. --- letsencrypt-apache/letsencrypt_apache/configurator.py | 2 +- .../letsencrypt_apache/tests/configurator_test.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py index 5d5907895..d8e929079 100644 --- a/letsencrypt-apache/letsencrypt_apache/configurator.py +++ b/letsencrypt-apache/letsencrypt_apache/configurator.py @@ -658,7 +658,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): def _remove_existing_ssl_directives(self, vh_path): for directive in ["SSLCertificateKeyFile", "SSLCertificateChainFile", - "SSLCACertificatePath", "SSLCertificateFile"]: + "SSLCertificateFile"]: logger.debug("Trying to delete directive '%s'", directive) directive_tree = self.parser.find_dir(directive, None, vh_path) logger.debug("Parser found %s", directive_tree) diff --git a/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py b/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py index b44b8bdda..f6cef0470 100644 --- a/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py +++ b/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py @@ -381,8 +381,8 @@ class TwoVhost80Test(util.ApacheTest): def test_remove_existing_ssl_directives(self): # pylint: disable=protected-access - BOGUS_DIRECTIVES = ["SSLCertificateKeyFile", "SSLCertificateChainFile", - "SSLCACertificatePath", "SSLCertificateFile"] + BOGUS_DIRECTIVES = ["SSLCertificateKeyFile", + "SSLCertificateChainFile", "SSLCertificateFile"] for directive in BOGUS_DIRECTIVES: self.config.parser.add_dir(self.vh_truth[0].path, directive, ["bogus"]) self.config.save()