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

Fix bug that stopped nginx from finding new server block for redirect (#5198)

Browse source 
* fix bug that stopped nginx from finding new server block for redirect

* add regression test
This commit is contained in:
ohemorange 2017-10-20 16:46:36 -07:00 committed by Brad Warren
parent 3c1dafa9e9
commit e2ab940ac0
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
certbot-nginx/certbot_nginx/configurator.py
View file

@ -266,7 +266,10 @@ class NginxConfigurator(common.Installer):
self.new_vhost.names = set()
self.new_vhost.names.add(domain)
name_block = [['\n ', 'server_name', ' ', ' '.join(self.new_vhost.names)]]
name_block = [['\n ', 'server_name']]
for name in self.new_vhost.names:
name_block[0].append(' ')
name_block[0].append(name)
self.parser.add_server_directives(self.new_vhost, name_block, replace=True)
return self.new_vhost

7
certbot-nginx/certbot_nginx/tests/configurator_test.py
View file

@ -676,6 +676,13 @@ class NginxConfiguratorTest(util.NginxTest):
"example/chain.pem",
"example/fullchain.pem")
self.config.deploy_cert(
"nomatch.com",
"example/cert.pem",
"example/key.pem",
"example/chain.pem",
"example/fullchain.pem")
self.config.enhance("www.nomatch.com", "redirect")
self.config.save()