upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-10 17:20:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove SSLCACertificatePath from removed directives

Browse source 
SSLCACertificatePath is sometimes important to preserve.
This commit is contained in:
Liam Marshall 2015-11-10 19:41:30 -06:00
parent 1f6ef1f4b1
commit 211c2bb33d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
letsencrypt-apache/letsencrypt_apache/configurator.py
View file

@ -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)

4
letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py
View file

@ -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()