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

moved temp check

Browse source
This commit is contained in:
Noah Swartz 2015-12-01 09:50:13 -08:00
parent bc6064addd
commit 739fd6614b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -276,11 +276,12 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"in the Apache config", target_name)
raise errors.PluginError("No vhost selected")
elif temp:
return vhost
elif not vhost.ssl:
addrs = self._get_proposed_addrs(vhost, "443")
# TODO: Conflicts is too conservative
if not any(vhost.enabled and vhost.conflicts(addrs) for vhost in self.vhosts)\
and not temp:
if not any(vhost.enabled and vhost.conflicts(addrs) for vhost in self.vhosts):
vhost = self.make_vhost_ssl(vhost)
else:
logger.error(