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

Avoid modifying parsed ssl_options

Browse Source
This commit is contained in:
Brad Warren
2016-08-16 18:40:05 -07:00
parent 76c2fe579a
commit 76d17bfd0f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot-nginx/certbot_nginx/configurator.py
+3 -5
View File
@@ -338,16 +338,14 @@ class NginxConfigurator(common.Plugin):
""" """
snakeoil_cert, snakeoil_key = self._get_snakeoil_paths() snakeoil_cert, snakeoil_key = self._get_snakeoil_paths()
options_subblock = self.parser.loc["ssl_options"]
# the options file doesn't have a newline at the beginning, but there # the options file doesn't have a newline at the beginning, but there
# needs to be one when it's dropped into the file # needs to be one when it's dropped into the file
if options_subblock and "\n" not in options_subblock[0]:
options_subblock[0].insert(0, "\n")
ssl_block = ( ssl_block = (
[['\n ', 'listen', ' ', '{0} ssl'.format(self.config.tls_sni_01_port)], [['\n ', 'listen', ' ', '{0} ssl'.format(self.config.tls_sni_01_port)],
['\n ', 'ssl_certificate', ' ', snakeoil_cert], ['\n ', 'ssl_certificate', ' ', snakeoil_cert],
['\n ', 'ssl_certificate_key', ' ', snakeoil_key]] + ['\n ', 'ssl_certificate_key', ' ', snakeoil_key],
options_subblock) ['\n']] +
self.parser.loc["ssl_options"])
self.parser.add_server_directives( self.parser.add_server_directives(
vhost.filep, vhost.names, ssl_block, replace=False) vhost.filep, vhost.names, ssl_block, replace=False)