From 0d01cbfc92c04f4f6cdca2739bc2a62326d52ac0 Mon Sep 17 00:00:00 2001 From: Joona Hoikkala Date: Sun, 8 Nov 2015 23:05:33 +0200 Subject: [PATCH] Refactored the port check from NamespaceConfig init to the validation function --- letsencrypt/configuration.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/letsencrypt/configuration.py b/letsencrypt/configuration.py index 082a69c21..8fa3cb2dc 100644 --- a/letsencrypt/configuration.py +++ b/letsencrypt/configuration.py @@ -38,10 +38,6 @@ class NamespaceConfig(object): def __init__(self, namespace): self.namespace = namespace check_config_sanity(self) - if self.http01_port == self.tls_sni_01_port: - raise errors.Error( - "Trying to run http-01 and tls-sni-01 " - "on the same port ({0})".format(self.tls_sni_01_port)) def __getattr__(self, name): return getattr(self.namespace, name) @@ -122,6 +118,12 @@ def check_config_sanity(config): :type args: :class:`letsencrypt.interfaces.IConfig` """ + # Port check + if config.http01_port == config.tls_sni_01_port: + raise errors.Error( + "Trying to run http-01 and tls-sni-01 " + "on the same port ({0})".format(config.tls_sni_01_port)) + # Domain checks if config.namespace.domains is not None: _check_config_domain_sanity(config.namespace.domains)