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

move save command up to tls_sni

Browse source
This commit is contained in:
Noah Swartz 2016-01-22 11:47:49 -08:00
parent b75b887a83
commit 5192fa36ab
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -557,11 +557,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
# search for NameVirtualHost directive for ip_addr
# note ip_addr can be FQDN although Apache does not recommend it
if self.version >= (2, 4):
return True
else:
self.save("don't lose config changes", True)
return self.parser.find_dir("NameVirtualHost", str(target_addr))
return (self.version >= (2, 4) or
self.parser.find_dir("NameVirtualHost", str(target_addr)))
def add_name_vhost(self, addr):
"""Adds NameVirtualHost directive for given address.

1
letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
View file

@ -76,6 +76,7 @@ class ApacheTlsSni01(common.TLSSNI01):
# Setup the configuration
addrs = self._mod_config()
self.configurator.save("Don't lose mod_config changes", True)
self.configurator.make_addrs_sni_ready(addrs)
# Save reversible changes