Merge pull request #1027 from letsencrypt/no_no_simple_http_tls

Removed no_simple_http_tls
certbot · Oct 19, 2015 · 3885a40 · 3885a40
2 parents 3aad546 + 98c74dd
commit 3885a40
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/letsencrypt/plugins/webroot.py b/letsencrypt/plugins/webroot.py
@@ -72,8 +72,7 @@ def _path_for_achall(self, achall):
         return os.path.join(self.full_root, achall.chall.encode("token"))
 
     def _perform_single(self, achall):
-        response, validation = achall.gen_response_and_validation(
-            tls=(not self.config.no_simple_http_tls))
+        response, validation = achall.gen_response_and_validation(tls=False)
         path = self._path_for_achall(achall)
         logger.debug("Attempting to save validation to %s", path)
         with open(path, "w") as validation_file:

diff --git a/letsencrypt/tests/renewer_test.py b/letsencrypt/tests/renewer_test.py
@@ -48,7 +48,6 @@ def setUp(self):
                 config_dir=self.tempdir,
                 work_dir=self.tempdir,
                 logs_dir=self.tempdir,
-                no_simple_http_tls=False,
             )
         )