external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00
Code Issues Releases Wiki Activity

have nsd bind to the network interaface that is connected to the Internet, rather than all non-loopback network interfaces

Browse Source 
hopefully fixes #121; thanks for the help @sfPlayer1
This commit is contained in:
Joshua Tauberer
2014-07-29 19:24:10 -04:00
parent c74bef12d2
commit 168c06939d
3 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
management/dns_update.py
View File

@@ -104,7 +104,7 @@ def do_dns_update(env):
zonefiles[i][1] += ".signed"
# Write the main nsd.conf file.
if write_nsd_conf(zonefiles):
if write_nsd_conf(zonefiles, env):
# Make sure updated_domains contains *something* if we wrote an updated
# nsd.conf so that we know to restart nsd.
if len(updated_domains) == 0:
@@ -383,7 +383,7 @@ $TTL 86400 ; default time to live
########################################################################
def write_nsd_conf(zonefiles):
def write_nsd_conf(zonefiles, env):
# Basic header.
nsdconf = """
server:
@@ -397,15 +397,13 @@ server:
"""
# Since we have bind9 listening on localhost for locally-generated
# DNS queries that require a recursive nameserver, we must have
# nsd listen only on public network interfaces. Those interfaces
# may have addresses different from the public IP address that the
# Internet sees this machine on. Get those interface addresses
# from `hostname -i` (which omits all localhost addresses).
for ipaddr in shell("check_output", ["/bin/hostname", "-I"]).strip().split(" "):
# DNS queries that require a recursive nameserver, and the system
# might have other network interfaces for e.g. tunnelling, we have
# to be specific about the network interfaces that nsd binds to.
for ipaddr in (env.get("PRIVATE_IP", "") + " " + env.get("PRIVATE_IPV6", "")).split(" "):
if ipaddr == "": continue
nsdconf += " ip-address: %s\n" % ipaddr
# Append the zones.
for domain, zonefile in zonefiles:
nsdconf += """