starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 19:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various WIP on nginx compatibility test

Browse Source
This commit is contained in:
Seth Schoen
2016-08-08 17:24:54 -07:00
parent e77a3ed7b9
commit d41ceff86d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/common.py
+6 -5
View File
@@ -75,12 +75,13 @@ class Proxy(configurators_common.Proxy):
for k in constants.CLI_DEFAULTS.keys(): for k in constants.CLI_DEFAULTS.keys():
setattr(self.le_config, "nginx_" + k, constants.os_constant(k)) setattr(self.le_config, "nginx_" + k, constants.os_constant(k))
# An alias # This does not appear to exist in nginx (yet?)
self.le_config.nginx_handle_modules = self.le_config.nginx_handle_mods # self.le_config.nginx_handle_modules = self.le_config.nginx_handle_mods
conf=configuration.NamespaceConfig(self.le_config)
zope.component.provideUtility(conf)
self._nginx_configurator = configurator.NginxConfigurator( self._nginx_configurator = configurator.NginxConfigurator(
config=configuration.NamespaceConfig(self.le_config), config=conf, name="nginx")
name="nginx")
self._nginx_configurator.prepare() self._nginx_configurator.prepare()
def cleanup_from_tests(self): def cleanup_from_tests(self):
@@ -118,7 +119,7 @@ def _get_server_root(config):
if os.path.isdir(os.path.join(config, name))] if os.path.isdir(os.path.join(config, name))]
if len(subdirs) != 1: if len(subdirs) != 1:
errors.Error("Malformed configuration directory {0}".format(config)) raise errors.Error("Malformed configuration directory {0}".format(config))
return os.path.join(config, subdirs[0].rstrip()) return os.path.join(config, subdirs[0].rstrip())