Merge remote-tracking branch 'github/letsencrypt/master' into acme

letsencrypt/client/revoker.py

@@ -25,7 +25,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
 

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
 

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.")