|
|
@ -575,7 +575,7 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
|
|
|
|
|
|
|
def get_sr_dns_net_allow_pass(self):
|
|
|
|
def get_sr_dns_net_allow_pass(self):
|
|
|
|
"""Текст в named.conf - доступные сети"""
|
|
|
|
"""Текст в named.conf - доступные сети"""
|
|
|
|
def getNetAllow():
|
|
|
|
def getNetAllow(netAllow):
|
|
|
|
netAllow = netAllow.split(",")
|
|
|
|
netAllow = netAllow.split(",")
|
|
|
|
foundLoc = False
|
|
|
|
foundLoc = False
|
|
|
|
for net in netAllow:
|
|
|
|
for net in netAllow:
|
|
|
@ -584,13 +584,13 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
break
|
|
|
|
break
|
|
|
|
if not foundLoc:
|
|
|
|
if not foundLoc:
|
|
|
|
netAllow.append("127.0.0.1")
|
|
|
|
netAllow.append("127.0.0.1")
|
|
|
|
netAllow = map(lambda x: "\t\t%s;"%x,netAllow)
|
|
|
|
netAllow = map(lambda x: "%s;"%x,netAllow)
|
|
|
|
netAllow = "\n".join(netAllow)
|
|
|
|
netAllow = " ".join(netAllow)
|
|
|
|
return "\tlisten-on {\n%s\n\t};"%netAllow
|
|
|
|
return "listen-on { %s };"%netAllow
|
|
|
|
netAllow = self.Get("sr_dns_net_allow")
|
|
|
|
netAllow = self.Get("sr_dns_net_allow")
|
|
|
|
if netAllow:
|
|
|
|
if netAllow:
|
|
|
|
return getNetAllow()
|
|
|
|
return getNetAllow(netAllow)
|
|
|
|
netAllow = self.Get("os_net_allow")
|
|
|
|
netAllow = self.Get("os_net_allow")
|
|
|
|
if netAllow:
|
|
|
|
if netAllow:
|
|
|
|
return getNetAllow()
|
|
|
|
return getNetAllow(netAllow)
|
|
|
|
return "\tlisten-on { 127.0.0.1; };"
|
|
|
|
return "listen-on { 127.0.0.1; };"
|