From 50e2f769c0d1a506df9db153b664583d0322ae07 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 29 Jan 2016 12:54:34 -0800 Subject: [PATCH] loc--, readability++ --- letsencrypt-apache/letsencrypt_apache/configurator.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py index 745a00719..9e3f34990 100644 --- a/letsencrypt-apache/letsencrypt_apache/configurator.py +++ b/letsencrypt-apache/letsencrypt_apache/configurator.py @@ -874,14 +874,11 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): # See if the exact address appears in any other vhost # Remember 1.1.1.1:* == 1.1.1.1 -> hence any() for addr in vhost.addrs: - # In Apache 2.2, when a NameVirtualHost directive is not # set, "*" and "_default_" will conflict when sharing a port - addrs = [addr] - if addr.get_addr() == "*": - addrs.append(obj.Addr(("_default_", addr.get_port(),))) - elif addr.get_addr() == "_default_": - addrs.append(obj.Addr(("*", addr.get_port(),))) + if addr.get_addr() in ("*", "_default_"): + addrs = [obj.Addr((a, addr.get_port(),)) + for a in ("*", "_default_")] for test_vh in self.vhosts: if (vhost.filep != test_vh.filep and