starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 19:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

rewrite generic files

Browse Source
This commit is contained in:
Noah Swartz
2016-02-16 15:48:36 -08:00
parent 3faec3d12b
commit 3964357eb3
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-apache/letsencrypt_apache/configurator.py
+7
View File
@@ -1074,6 +1074,9 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
if not self._is_rewrite_engine_on(general_vh): if not self._is_rewrite_engine_on(general_vh):
self.parser.add_dir(general_vh.path, "RewriteEngine", "on") self.parser.add_dir(general_vh.path, "RewriteEngine", "on")
for name in ssl_vhost.get_names():
self.parser.add_dir(general_vh.path, "RewriteCond",
["%{SERVER_NAME}", "={0}".format(name), "[OR]"]
if self.get_version() >= (2, 3, 9): if self.get_version() >= (2, 3, 9):
self.parser.add_dir(general_vh.path, "RewriteRule", self.parser.add_dir(general_vh.path, "RewriteRule",
constants.REWRITE_HTTPS_ARGS_WITH_END) constants.REWRITE_HTTPS_ARGS_WITH_END)
@@ -1243,6 +1246,10 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
for http_vh in candidate_http_vhs: for http_vh in candidate_http_vhs:
if http_vh.same_server(ssl_vhost): if http_vh.same_server(ssl_vhost):
return http_vh return http_vh
# Third filter - if none with same names, return generic
for http_vh in candidate_http_vhs:
if http_vh.same_server(ssl_vhost, generic=True):
return http_vh
return None return None
letsencrypt-apache/letsencrypt_apache/obj.py
+6 -1
View File
@@ -189,7 +189,7 @@ class VirtualHost(object): # pylint: disable=too-few-public-methods
return True return True
return False return False
def same_server(self, vhost): def same_server(self, vhost, generic=False):
"""Determines if the vhost is the same 'server'. """Determines if the vhost is the same 'server'.
Used in redirection - indicates whether or not the two virtual hosts Used in redirection - indicates whether or not the two virtual hosts
@@ -199,12 +199,17 @@ class VirtualHost(object): # pylint: disable=too-few-public-methods
""" """
if not generic:
if vhost.get_names() != self.get_names(): if vhost.get_names() != self.get_names():
return False return False
# If equal and set is not empty... assume same server # If equal and set is not empty... assume same server
if self.name is not None or self.aliases: if self.name is not None or self.aliases:
return True return True
# If we're looking for a generic vhost, don't return one with a ServerName
else:
if self.name:
return False
# Both sets of names are empty. # Both sets of names are empty.