upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 15:22:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

loc--, readability++

Browse source
This commit is contained in:
Brad Warren 2016-01-29 12:54:34 -08:00
parent 870a743ce1
commit 50e2f769c0
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
letsencrypt-apache/letsencrypt_apache/configurator.py
View file

@ -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