external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00
Code Issues Releases Wiki Activity

set nginx server_names_hash_bucket_size to 64, fixes #93

Browse Source
This commit is contained in:
Joshua Tauberer 2014-07-07 11:23:31 +00:00
parent 430b2dec11
commit cf7053c124
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/web.sh
View File

@ -13,6 +13,11 @@ rm -f /etc/nginx/sites-enabled/default
# SSL settings from @konklone # SSL settings from @konklone
cp conf/nginx-ssl.conf /etc/nginx/nginx-ssl.conf cp conf/nginx-ssl.conf /etc/nginx/nginx-ssl.conf
# Fix some nginx defaults.
# The server_names_hash_bucket_size seems to prevent long domain names?
tools/editconf.py /etc/nginx/nginx.conf -s \
server_names_hash_bucket_size="64;"
# Other nginx settings will be configured by the management service # Other nginx settings will be configured by the management service
# since it depends on what domains we're serving, which we don't know # since it depends on what domains we're serving, which we don't know
# until mail accounts have been created. # until mail accounts have been created.

13
tools/editconf.py
View File

@ -68,24 +68,29 @@ while len(input_lines) > 0:
for i in range(len(settings)): for i in range(len(settings)):
# Check that this line contain this setting from the command-line arguments. # Check that this line contain this setting from the command-line arguments.
name, val = settings[i].split("=", 1) name, val = settings[i].split("=", 1)
m = re.match("\s*" + re.escape(name) + delimiter_re + "(.*?)\s*$", line, re.S) m = re.match("(\s*)(#\s*)?" + re.escape(name) + delimiter_re + "(.*?)\s*$", line, re.S)
if not m: continue if not m: continue
indent, is_comment, existing_val = m.groups()
# If this is already the setting, do nothing. # If this is already the setting, do nothing.
if m.group(1) == val: if is_comment is None and existing_val == val:
buf += line buf += line
found.add(i) found.add(i)
break break
# comment-out the existing line (also comment any folded lines) # comment-out the existing line (also comment any folded lines)
buf += "#" + line.rstrip().replace("\n", "\n#") + "\n" if is_comment is None:
buf += "#" + line.rstrip().replace("\n", "\n#") + "\n"
else:
# the line is already commented, pass it through
buf += line
# if this option oddly appears more than once, don't add the setting again # if this option oddly appears more than once, don't add the setting again
if i in found: if i in found:
break break
# add the new setting # add the new setting
buf += name + delimiter + val + "\n" buf += indent + name + delimiter + val + "\n"
# note that we've applied this option # note that we've applied this option
found.add(i) found.add(i)