Skip to content

Commit

Permalink
added interesticial saves to apache changes which fixed bug when mult…
Browse files Browse the repository at this point in the history
…iple vhosts were specified
  • Loading branch information
Noah Swartz authored and Noah Swartz committed Oct 30, 2015
1 parent 05be568 commit fbd09dd
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion letsencrypt-apache/letsencrypt_apache/configurator.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ def deploy_cert(self, domain, cert_path, key_path,
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
Expand Down
1 change: 0 additions & 1 deletion letsencrypt/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion letsencrypt/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ def deploy_certificate(self, domains, privkey_path,
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
Expand Down
2 changes: 1 addition & 1 deletion letsencrypt/tests/client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def test_deploy_certificate(self):
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")
Expand Down

0 comments on commit fbd09dd

Please sign in to comment.