starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-28 00:35:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename --simple-http-port to --http-01-port

Browse Source
This commit is contained in:
Jakub Warmuz
2015-11-01 11:01:23 +00:00
parent 1d36a15ab7
commit 23d3c3b1e2
11 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/plugins/manual.py
+3 -3
View File
@@ -132,8 +132,8 @@ s.serve_forever()" """
# same server: default command doesn't support virtual hosts
response, validation = achall.response_and_validation()
port = (response.port if self.config.simple_http_port is None
else int(self.config.simple_http_port))
port = (response.port if self.config.http01_port is None
else int(self.config.http01_port))
command = self.CMD_TEMPLATE.format(
root=self._root, achall=achall, response=response,
# TODO(kuba): pipes still necessary?
@@ -174,7 +174,7 @@ s.serve_forever()" """
if response.simple_verify(
achall.chall, achall.domain,
achall.account_key.public_key(), self.config.simple_http_port):
achall.account_key.public_key(), self.config.http01_port):
return response
else:
logger.error(
letsencrypt/plugins/manual_test.py
+2 -2
View File
@@ -23,13 +23,13 @@ class AuthenticatorTest(unittest.TestCase):
def setUp(self):
from letsencrypt.plugins.manual import Authenticator
self.config = mock.MagicMock(
simple_http_port=8080, manual_test_mode=False)
http01_port=8080, manual_test_mode=False)
self.auth = Authenticator(config=self.config, name="manual")
self.achalls = [achallenges.KeyAuthorizationAnnotatedChallenge(
challb=acme_util.HTTP01_P, domain="foo.com", account_key=KEY)]
config_test_mode = mock.MagicMock(
simple_http_port=8080, manual_test_mode=True)
http01_port=8080, manual_test_mode=True)
self.auth_test_mode = Authenticator(
config=config_test_mode, name="manual")
letsencrypt/plugins/standalone.py
+2 -2
View File
@@ -185,7 +185,7 @@ class Authenticator(common.Plugin):
def _necessary_ports(self):
necessary_ports = set()
if challenges.HTTP01 in self.supported_challenges:
necessary_ports.add(self.config.simple_http_port)
necessary_ports.add(self.config.http01_port)
if challenges.DVSNI in self.supported_challenges:
necessary_ports.add(self.config.dvsni_port)
return necessary_ports
@@ -238,7 +238,7 @@ class Authenticator(common.Plugin):
for achall in achalls:
if isinstance(achall.chall, challenges.HTTP01):
server = self.servers.run(
self.config.simple_http_port, challenges.HTTP01)
self.config.http01_port, challenges.HTTP01)
response, validation = achall.response_and_validation()
self.simple_http_resources.add(
acme_standalone.HTTP01RequestHandler.HTTP01Resource(
letsencrypt/plugins/standalone_test.py
+1 -1
View File
@@ -92,7 +92,7 @@ class AuthenticatorTest(unittest.TestCase):
def setUp(self):
from letsencrypt.plugins.standalone import Authenticator
self.config = mock.MagicMock(
dvsni_port=1234, simple_http_port=4321,
dvsni_port=1234, http01_port=4321,
standalone_supported_challenges="dvsni,http-01")
self.auth = Authenticator(self.config, name="standalone")