upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-07 07:42:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
Conflicts:
	letsencrypt/client/plugins/apache/configurator.py
This commit is contained in:
Jakub Warmuz 2015-05-04 08:14:19 +00:00
commit 1c75100f79
No known key found for this signature in database
GPG key ID: 2A7BAD3A489B52EA
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
letsencrypt/client/network2.py
View file

@ -315,11 +315,7 @@ class Network(object):
try:
authzr_uri = response.links['up']['url']
except KeyError:
# TODO: Right now Boulder responds with the authorization resource
# instead of a challenge resource... this can be uncommented
# once the error is fixed (boulder#130).
return None
# raise errors.NetworkError('"up" Link header missing')
raise errors.NetworkError('"up" Link header missing')
challr = messages2.ChallengeResource(
authzr_uri=authzr_uri,
body=messages2.ChallengeBody.from_json(response.json()))

4
letsencrypt/client/plugins/apache/configurator.py
View file

@ -923,7 +923,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"""
try:
proc = subprocess.Popen(
["sudo", self.conf('ctl'), "configtest"], # TODO: sudo?
[self.conf('ctl'), "configtest"],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stdout, stderr = proc.communicate()
@ -1061,7 +1061,7 @@ def enable_mod(mod_name, apache_init_script, apache_enmod):
try:
# Use check_output so the command will finish before reloading
# TODO: a2enmod is debian specific...
subprocess.check_call(["sudo", apache_enmod, mod_name], # TODO: sudo?
subprocess.check_call([apache_enmod, mod_name],
stdout=open("/dev/null", "w"),
stderr=open("/dev/null", "w"))
apache_restart(apache_init_script)

7
letsencrypt/client/tests/network2_test.py
View file

@ -286,11 +286,8 @@ class NetworkTest(unittest.TestCase):
def test_answer_challenge_missing_next(self):
self._mock_post_get()
self.assertTrue(self.net.answer_challenge(
self.challr.body, challenges.DNSResponse()) is None)
# TODO: boulder#130, acme-spec#110
# self.assertRaises(errors.NetworkError, self.net.answer_challenge,
# self.challr.body, challenges.DNSResponse())
self.assertRaises(errors.NetworkError, self.net.answer_challenge,
self.challr.body, challenges.DNSResponse())
def test_retry_after_date(self):
self.response.headers['Retry-After'] = 'Fri, 31 Dec 1999 23:59:59 GMT'