From df05866f79118b19f4619663da0b52120e769b97 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sun, 17 Apr 2016 19:28:44 +0000 Subject: [PATCH 1/2] Use .test. instead of .wtf. (fixes #71) --- .travis.yml | 4 ++-- simp_le.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a84f150..93c1320 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ services: addons: mariadb: '10.0' hosts: - - le.wtf - - le2.wtf + - le.test + - le2.test - boulder - boulder-mysql - boulder-rabbitmq diff --git a/simp_le.py b/simp_le.py index 3cdcfeb..edd1fec 100755 --- a/simp_le.py +++ b/simp_le.py @@ -1464,7 +1464,9 @@ class IntegrationTests(unittest.TestCase): """Integrations tests with Boulder. Prerequisites: - - /etc/hosts:127.0.0.1 le.wtf + - /etc/hosts: + - 127.0.0.1 le.test + - 127.0.0.1 le2.test - Boulder running on localhost:4000 - Boulder verifying http-01 on port 5002 """ @@ -1508,7 +1510,7 @@ def _single_path_stats(path): def test_it(self): webroot = os.path.join(os.getcwd(), 'public_html') args = ('--server %s --tos_sha256 %s -f account_key.json ' - '-f key.pem -f full.pem -d le.wtf:%s' % ( + '-f key.pem -f full.pem -d le.test:%s' % ( self.SERVER, self.TOS_SHA256, webroot)) files = ('account_key.json', 'key.pem', 'full.pem') with self._new_swd(): @@ -1528,7 +1530,7 @@ def test_it(self): # Changing SANs should trigger "renewal" self.assertEqual( - EXIT_RENEWAL, self._run('%s -d le2.wtf:%s' % (args, webroot))) + EXIT_RENEWAL, self._run('%s -d le2.test:%s' % (args, webroot))) if __name__ == '__main__': From 78d3a200430953de3dff1dc0dcb0ca138c5ccc8c Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sun, 17 Apr 2016 19:41:17 +0000 Subject: [PATCH 2/2] Use *.example.org .test is not in PSL: ACME server returned an error: urn:acme:error:malformed :: The request message was malformed :: Error creating new authz :: Name does not end in a public suffix --- .travis.yml | 4 ++-- simp_le.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93c1320..e373692 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ services: addons: mariadb: '10.0' hosts: - - le.test - - le2.test + - le.example.org + - le2.example.org - boulder - boulder-mysql - boulder-rabbitmq diff --git a/simp_le.py b/simp_le.py index edd1fec..74624d5 100755 --- a/simp_le.py +++ b/simp_le.py @@ -1465,8 +1465,8 @@ class IntegrationTests(unittest.TestCase): Prerequisites: - /etc/hosts: - - 127.0.0.1 le.test - - 127.0.0.1 le2.test + - 127.0.0.1 le.example.org + - 127.0.0.1 le2.example.org - Boulder running on localhost:4000 - Boulder verifying http-01 on port 5002 """ @@ -1510,7 +1510,7 @@ def _single_path_stats(path): def test_it(self): webroot = os.path.join(os.getcwd(), 'public_html') args = ('--server %s --tos_sha256 %s -f account_key.json ' - '-f key.pem -f full.pem -d le.test:%s' % ( + '-f key.pem -f full.pem -d le.example.org:%s' % ( self.SERVER, self.TOS_SHA256, webroot)) files = ('account_key.json', 'key.pem', 'full.pem') with self._new_swd(): @@ -1529,8 +1529,8 @@ def test_it(self): self.assertEqual(initial_stats, self.get_stats(*files)) # Changing SANs should trigger "renewal" - self.assertEqual( - EXIT_RENEWAL, self._run('%s -d le2.test:%s' % (args, webroot))) + self.assertEqual(EXIT_RENEWAL, self._run( + '%s -d le2.example.org:%s' % (args, webroot))) if __name__ == '__main__':