diff options
| author | Erica Portnoy <ebportnoy@gmail.com> | 2017-01-11 04:27:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-11 04:27:09 +0300 |
| commit | c00568a518cd04efceac003f979659bb29368969 (patch) | |
| tree | 07c6415a85a732456cf02d14c0925452e686b003 /certbot-nginx | |
| parent | 9c9004aff1dd3b050d81a448b4abe557c50347eb (diff) | |
Break on failure to deploy cert (#4003)
* Break on failure to deploy cert
* Add error message for unable to install cert
* Add unit test
Diffstat (limited to 'certbot-nginx')
| -rw-r--r-- | certbot-nginx/certbot_nginx/configurator.py | 6 | ||||
| -rw-r--r-- | certbot-nginx/certbot_nginx/tests/configurator_test.py | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/certbot-nginx/certbot_nginx/configurator.py b/certbot-nginx/certbot_nginx/configurator.py index f3acb5560..f19a07910 100644 --- a/certbot-nginx/certbot_nginx/configurator.py +++ b/certbot-nginx/certbot_nginx/configurator.py @@ -191,11 +191,9 @@ class NginxConfigurator(common.Plugin): vhost.filep, vhost.names) except errors.MisconfigurationError as error: logger.debug(error) - logger.warning( - "Cannot find a cert or key directive in %s for %s. " - "VirtualHost was not modified.", vhost.filep, vhost.names) # Presumably break here so that the virtualhost is not modified - return False + raise errors.PluginError("Cannot find a cert or key directive in {0} for {1}. " + "VirtualHost was not modified.".format(vhost.filep, vhost.names)) self.save_notes += ("Changed vhost at %s with addresses of %s\n" % (vhost.filep, diff --git a/certbot-nginx/certbot_nginx/tests/configurator_test.py b/certbot-nginx/certbot_nginx/tests/configurator_test.py index 6886127d7..cc36aa0de 100644 --- a/certbot-nginx/certbot_nginx/tests/configurator_test.py +++ b/certbot-nginx/certbot_nginx/tests/configurator_test.py @@ -158,6 +158,18 @@ class NginxConfiguratorTest(util.NginxTest): "example/chain.pem", None) + @mock.patch('certbot_nginx.parser.NginxParser.add_server_directives') + def test_deploy_cert_raise_on_add_error(self, mock_add_server_directives): + mock_add_server_directives.side_effect = errors.MisconfigurationError() + self.assertRaises( + errors.PluginError, + self.config.deploy_cert, + "migration.com", + "example/cert.pem", + "example/key.pem", + "example/chain.pem", + "example/fullchain.pem") + def test_deploy_cert(self): server_conf = self.config.parser.abs_path('server.conf') nginx_conf = self.config.parser.abs_path('nginx.conf') |