From f8185c1913610c4911d03e2512c1d0b7d59fb774 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 31 Oct 2015 11:47:25 +0000 Subject: [PATCH 1/5] Add Python 2.6 setup.py classifiers. --- acme/setup.py | 1 + letsencrypt-apache/setup.py | 1 + letsencrypt-compatibility-test/setup.py | 1 + letsencrypt-nginx/setup.py | 1 + letshelp-letsencrypt/setup.py | 1 + 5 files changed, 5 insertions(+) diff --git a/acme/setup.py b/acme/setup.py index 2495a42ff..a6551a023 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -58,6 +58,7 @@ setup( 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python', 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', diff --git a/letsencrypt-apache/setup.py b/letsencrypt-apache/setup.py index 2180219f1..e4dd11935 100644 --- a/letsencrypt-apache/setup.py +++ b/letsencrypt-apache/setup.py @@ -41,6 +41,7 @@ setup( 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Security', diff --git a/letsencrypt-compatibility-test/setup.py b/letsencrypt-compatibility-test/setup.py index 1608769e2..c791d51c4 100644 --- a/letsencrypt-compatibility-test/setup.py +++ b/letsencrypt-compatibility-test/setup.py @@ -38,6 +38,7 @@ setup( 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python', 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Security', diff --git a/letsencrypt-nginx/setup.py b/letsencrypt-nginx/setup.py index 5d80807d1..a669ad841 100644 --- a/letsencrypt-nginx/setup.py +++ b/letsencrypt-nginx/setup.py @@ -41,6 +41,7 @@ setup( 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Security', diff --git a/letshelp-letsencrypt/setup.py b/letshelp-letsencrypt/setup.py index a63e0aad4..04b879e14 100644 --- a/letshelp-letsencrypt/setup.py +++ b/letshelp-letsencrypt/setup.py @@ -34,6 +34,7 @@ setup( 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Security', From d5a2c7fa18f8dce9f08e0bfe25fb7b06c74ac980 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 31 Oct 2015 11:48:19 +0000 Subject: [PATCH 2/5] We don't use lsb-release any more --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 862e963b1..8586c3840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,6 @@ addons: mariadb: "10.0" apt: packages: # keep in sync with bootstrap/ubuntu.sh and Boulder - - lsb-release - python - python-dev - python-virtualenv From bd3d373d99fc1f8c58d5d0c0770d4b010cc125ba Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 31 Oct 2015 11:48:33 +0000 Subject: [PATCH 3/5] Fix docs for deps.sh --- tools/deps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/deps.sh b/tools/deps.sh index 28bfdaff5..6fb2bf63b 100755 --- a/tools/deps.sh +++ b/tools/deps.sh @@ -2,9 +2,9 @@ # # Find all Python imports. # -# ./deps.sh letsencrypt -# ./deps.sh acme -# ./deps.sh letsencrypt-apache +# ./tools/deps.sh letsencrypt +# ./tools/deps.sh acme +# ./tools/deps.sh letsencrypt-apache # ... # # Manually compare the output with deps in setup.py. From fb736135c50aa4660f4ba37ccd8a59ef3ec486d0 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 31 Oct 2015 18:24:32 +0000 Subject: [PATCH 4/5] Fix manual plugin __doc__ indentantion --- letsencrypt/plugins/manual.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/letsencrypt/plugins/manual.py b/letsencrypt/plugins/manual.py index c76463f85..18654c629 100644 --- a/letsencrypt/plugins/manual.py +++ b/letsencrypt/plugins/manual.py @@ -26,12 +26,13 @@ logger = logging.getLogger(__name__) class Authenticator(common.Plugin): """Manual Authenticator. - This plugin requires user's manual intervention in setting up a HTTP - server for solving SimpleHTTP challenges and thus does not need to be - run as a privileged process. Alternatively shows instructions on how - to use Python's built-in HTTP server. + This plugin requires user's manual intervention in setting up a HTTP + server for solving SimpleHTTP challenges and thus does not need to + be run as a privileged process. Alternatively shows instructions on + how to use Python's built-in HTTP server. .. todo:: Support for `~.challenges.DVSNI`. + """ zope.interface.implements(interfaces.IAuthenticator) zope.interface.classProvides(interfaces.IPluginFactory) From 3c2ea0c878c718948cf8f25ec6f3a47f808351ba Mon Sep 17 00:00:00 2001 From: Martin Brugger Date: Sat, 31 Oct 2015 20:09:04 +0100 Subject: [PATCH 5/5] Only works for me with port 80 and 443 forwarded For the docker client to work correctly I needed to forward both ports 443 and 80. I will take a closer look on how this is supposed to work. --- docs/using.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/using.rst b/docs/using.rst index 73c3fe140..6d8130886 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -73,7 +73,7 @@ to, `install Docker`_, then issue the following command: .. code-block:: shell - sudo docker run -it --rm -p 443:443 --name letsencrypt \ + sudo docker run -it --rm -p 443:443 -p 80:80 --name letsencrypt \ -v "/etc/letsencrypt:/etc/letsencrypt" \ -v "/var/lib/letsencrypt:/var/lib/letsencrypt" \ quay.io/letsencrypt/letsencrypt:latest auth