Merge remote-tracking branch 'github/letsencrypt/master' into http-01

.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

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',

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

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',

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',

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',

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
+    This plugin requires user's manual intervention in setting up a HTTP
-       server for solving http-01 challenges and thus does not need to be
+    server for solving http-01 challenges and thus does not need to be
-       run as a privileged process. Alternatively shows instructions on how
+    run as a privileged process. Alternatively shows instructions on how
-       to use Python's built-in HTTP server.
+    to use Python's built-in HTTP server.
 
     .. todo:: Support for `~.challenges.DVSNI`.
+
     """
     zope.interface.implements(interfaces.IAuthenticator)
     zope.interface.classProvides(interfaces.IPluginFactory)

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',

tools/deps.sh

@@ -2,9 +2,9 @@
 #
 # Find all Python imports.
 #
-#  ./deps.sh letsencrypt
+#  ./tools/deps.sh letsencrypt
-#  ./deps.sh acme
+#  ./tools/deps.sh acme
-#  ./deps.sh letsencrypt-apache
+#  ./tools/deps.sh letsencrypt-apache
 #  ...
 #
 # Manually compare the output with deps in setup.py.