starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-27 00:00:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix syntax and don't have unneeded ors

Browse Source
This commit is contained in:
Noah Swartz
2016-02-16 15:58:53 -08:00
parent 3964357eb3
commit bf30e54a32
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-apache/letsencrypt_apache/configurator.py
+6 -3
View File
@@ -1073,10 +1073,13 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
# even with save() and load()
if not self._is_rewrite_engine_on(general_vh):
self.parser.add_dir(general_vh.path, "RewriteEngine", "on")
for name in ssl_vhost.get_names():
cond = "[OR]"
names = ssl_vhost.get_names()
for idx, name in enumerate(names):
if idx == len(names) - 1:
cond = ""
self.parser.add_dir(general_vh.path, "RewriteCond",
["%{SERVER_NAME}", "={0}".format(name), "[OR]"]
["%{SERVER_NAME}", "={0}".format(name), cond])
if self.get_version() >= (2, 3, 9):
self.parser.add_dir(general_vh.path, "RewriteRule",
constants.REWRITE_HTTPS_ARGS_WITH_END)