upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-03-22 10:31:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

A couple of fixes

Browse source
This commit is contained in:
Peter Eckersley 2016-07-21 13:26:57 -07:00
parent 2ce5b195e5
commit e5cb04ee7d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
certbot-nginx/certbot_nginx/parser.py
View file

@ -520,7 +520,7 @@ def _add_directives(block, directives, replace):
last = block[-1]
if not (isinstance(last, str) and '\n' in last):
block.append('\n')
REPEATABLE_DIRECTIVES = set(['server_name', 'listen', 'include'])
COMMENT_STR = ' managed by Certbot'
@ -531,7 +531,7 @@ def _comment_directive(block, location):
"""Add a comment to the end of the line at location."""
if len(block) > location + 1: # there is a block after us
next_entry = block[location + 1]
else:
else:
# we're at the end of the block, pretend there's a newline after us; it will actually be added later in
# add_directives
next_entry = "\n"
@ -576,7 +576,7 @@ def _add_directive(block, directive, replace):
if location is None or (isinstance(directive_name, str) and
directive_name in REPEATABLE_DIRECTIVES):
block.append(directive)
_comment_directive(block, len(block))
_comment_directive(block, len(block) - 1)
elif block[location][1] != directive_value:
raise errors.MisconfigurationError(
'tried to insert directive "{0}" but found '