Merge remote-tracking branch 'github/letsencrypt/master' into mock-2.6

letsencrypt-nginx/letsencrypt_nginx/configurator.py

@@ -56,7 +56,7 @@ class NginxConfigurator(common.Plugin):
     zope.interface.implements(interfaces.IAuthenticator, interfaces.IInstaller)
     zope.interface.classProvides(interfaces.IPluginFactory)
 
-    description = "Nginx Web Server"
+    description = "Nginx Web Server - currently doesn't work"
 
     @classmethod
     def add_parser_arguments(cls, add):

letsencrypt-nginx/letsencrypt_nginx/nginxparser.py

@@ -7,6 +7,7 @@ from pyparsing import (
 from pyparsing import stringEnd
 from pyparsing import restOfLine
 
+
 class RawNginxParser(object):
     # pylint: disable=expression-not-assigned
     """A class that parses nginx configuration with pyparsing."""
@@ -32,10 +33,10 @@ class RawNginxParser(object):
     block = Forward()
 
     block << Group(
-        (Group(key + location_statement) ^ Group(if_statement))
-        + left_bracket
-        + Group(ZeroOrMore(Group(comment | assignment) | block))
-        + right_bracket)
+        (Group(key + location_statement) ^ Group(if_statement)) +
+        left_bracket +
+        Group(ZeroOrMore(Group(comment | assignment) | block)) +
+        right_bracket)
 
     script = OneOrMore(Group(comment | assignment) ^ block) + stringEnd
 

letsencrypt-nginx/letsencrypt_nginx/tests/dvsni_test.py

@@ -41,7 +41,6 @@ class DvsniPerformTest(util.NginxTest):
             domain="www.example.org", account_key=account_key),
     ]
 
-
     def setUp(self):
         super(DvsniPerformTest, self).setUp()
 

letsencrypt-nginx/letsencrypt_nginx/tests/util.py

@@ -4,9 +4,12 @@ import pkg_resources
 import unittest
 
 import mock
+import zope.component
 
 from acme import jose
 
+from letsencrypt import configuration
+
 from letsencrypt.tests import test_util
 
 from letsencrypt.plugins import common
@@ -55,11 +58,17 @@ def get_nginx_configurator(
             backup_dir=backups,
             temp_checkpoint_dir=os.path.join(work_dir, "temp_checkpoints"),
             in_progress_dir=os.path.join(backups, "IN_PROGRESS"),
+            server="https://acme-server.org:443/new",
             dvsni_port=5001,
         ),
         name="nginx",
         version=version)
     config.prepare()
+
+    # Provide general config utility.
+    nsconfig = configuration.NamespaceConfig(config.config)
+    zope.component.provideUtility(nsconfig)
+
     return config
 
 

letsencrypt-nginx/setup.py

@@ -7,7 +7,9 @@ from setuptools import find_packages
 install_requires = [
     'acme',
     'letsencrypt',
+    'PyOpenSSL',
     'pyparsing>=1.5.5',  # Python3 support; perhaps unnecessary?
+    'setuptools',  # pkg_resources
     'zope.interface',
 ]
 
@@ -23,7 +25,7 @@ setup(
     entry_points={
         'letsencrypt.plugins': [
             'nginx = letsencrypt_nginx.configurator:NginxConfigurator',
-         ],
+        ],
     },
     include_package_data=True,
 )