added interesticial saves to apache changes which fixed bug when multiple vhosts were specified

This commit is contained in:
Noah Swartz
2015-10-30 13:24:55 -07:00
parent 05be568e9e
commit fbd09ddbf6
4 changed files with 2 additions and 4 deletions
@@ -219,7 +219,6 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.parser.add_dir(
vhost.path, "SSLCertificateChainFile", chain_path)
else:
# TODO: THIS???
self.aug.set(path["chain_path"][-1], chain_path)
# Save notes about the transaction that took place
-1
View File
@@ -468,7 +468,6 @@ def install(args, config, plugins):
# XXX: Update for renewer/RenewableCert
try:
#TODO: maybe an error? not choose_configurator_plugins?
installer, _ = choose_configurator_plugins(args, config, plugins, "auth")
except PluginSelectionError, e:
return e.message
+1 -1
View File
@@ -334,7 +334,7 @@ class Client(object):
key_path=os.path.abspath(privkey_path),
chain_path=chain_path,
fullchain_path=fullchain_path)
# TODO: call self.installer.save() << in progress save
self.installer.save()
self.installer.save("Deployed Let's Encrypt Certificate")
# sites may have been enabled / final cleanup
+1 -1
View File
@@ -159,7 +159,7 @@ class ClientTest(unittest.TestCase):
domain='foo.bar',
fullchain_path='fullchain',
key_path=os.path.abspath("key"))
self.assertEqual(installer.save.call_count, 1)
self.assertEqual(installer.save.call_count, 2)
installer.restart.assert_called_once_with()
@mock.patch("letsencrypt.client.enhancements")