From 9beded8cfb3f854862b34e77552413173543771f Mon Sep 17 00:00:00 2001 From: James Kasten Date: Mon, 9 Feb 2015 16:04:46 -0800 Subject: [PATCH 1/2] fix local name changes --- letsencrypt/client/revoker.py | 2 +- letsencrypt/client/tests/client_authenticator_test.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/letsencrypt/client/revoker.py b/letsencrypt/client/revoker.py index 3a194610b..297866e54 100644 --- a/letsencrypt/client/revoker.py +++ b/letsencrypt/client/revoker.py @@ -23,7 +23,7 @@ class Revoker(object): """ def __init__(self, installer, config): - self.network = network.Network(config.acme_server) + self.network = network.Network(config.server) self.installer = installer self.config = config diff --git a/letsencrypt/client/tests/client_authenticator_test.py b/letsencrypt/client/tests/client_authenticator_test.py index 2f49b07d7..b2eff7d28 100644 --- a/letsencrypt/client/tests/client_authenticator_test.py +++ b/letsencrypt/client/tests/client_authenticator_test.py @@ -11,7 +11,7 @@ class PerformTest(unittest.TestCase): from letsencrypt.client.client_authenticator import ClientAuthenticator self.auth = ClientAuthenticator( - mock.MagicMock(acme_server="demo_server.org")) + mock.MagicMock(server="demo_server.org")) self.auth.rec_token.perform = mock.MagicMock( name="rec_token_perform", side_effect=gen_client_resp) @@ -51,8 +51,8 @@ class CleanupTest(unittest.TestCase): def setUp(self): from letsencrypt.client.client_authenticator import ClientAuthenticator - self.auth = ClientAuthenticator(mock.MagicMock( - acme_server="demo_server.org")) + self.auth = ClientAuthenticator( + mock.MagicMock(server="demo_server.org")) self.mock_cleanup = mock.MagicMock(name="rec_token_cleanup") self.auth.rec_token.cleanup = self.mock_cleanup From 523c59d32973a8c90953d223d320e335b582d038 Mon Sep 17 00:00:00 2001 From: James Kasten Date: Mon, 9 Feb 2015 16:39:08 -0800 Subject: [PATCH 2/2] revert to binary redirect logic --- letsencrypt/scripts/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/letsencrypt/scripts/main.py b/letsencrypt/scripts/main.py index 784f8d691..a2a5f3c62 100755 --- a/letsencrypt/scripts/main.py +++ b/letsencrypt/scripts/main.py @@ -43,7 +43,9 @@ def create_parser(): help="Revert configuration N number of checkpoints.") add("-v", "--view-config-changes", action="store_true", help="View checkpoints and associated configuration changes.") - add("-r", "--redirect", type=bool, default=None, + + # TODO: resolve - assumes binary logic while client.py assumes ternary. + add("-r", "--redirect", action="store_true", help="Automatically redirect all HTTP traffic to HTTPS for the newly " "authenticated vhost.")