|
|
|
@ -16904,10 +16904,10 @@ class dnsTxt(cl_profile.bind,shareTxt):
|
|
|
|
|
dnsDN = "ou=Forward,%s"%dnsBaseDN
|
|
|
|
|
#TODO intendation breaks config
|
|
|
|
|
template = 'zone "%s" in {\n\
|
|
|
|
|
\ttype %s;\n\
|
|
|
|
|
\tdatabase "ldap ldap://127.0.0.1/zoneName=%s,%s????\
|
|
|
|
|
!bindname=%s,!x-bindpw=%s 178600";\n\
|
|
|
|
|
};' %(zoneName,zoneType,zoneName,dnsDN,dnsCommaSplDN,dnsBasePw)
|
|
|
|
|
\ttype %s;\n\
|
|
|
|
|
\tdatabase "ldap ldap://127.0.0.1/zoneName=%s,%s????\
|
|
|
|
|
!bindname=%s,!x-bindpw=%s 178600";\n\
|
|
|
|
|
};' %(zoneName,zoneType,zoneName,dnsDN,dnsCommaSplDN,dnsBasePw)
|
|
|
|
|
return template
|
|
|
|
|
elif zoneType == "slave":
|
|
|
|
|
if not zoneMasters:
|
|
|
|
@ -16917,10 +16917,10 @@ class dnsTxt(cl_profile.bind,shareTxt):
|
|
|
|
|
return False
|
|
|
|
|
zoneFile = "%s.zone" %zoneName.split(".in-addr.arpa")[0]
|
|
|
|
|
template = 'zone "%s" {\n\
|
|
|
|
|
\ttype %s;\n\
|
|
|
|
|
\tfile "sec/%s";\n\
|
|
|
|
|
\tmasters { %s; };\n\
|
|
|
|
|
};' %(zoneName,zoneType,zoneFile, "; ".join(zoneMasters))
|
|
|
|
|
\ttype %s;\n\
|
|
|
|
|
\tfile "sec/%s";\n\
|
|
|
|
|
\tmasters { %s; };\n\
|
|
|
|
|
};' %(zoneName,zoneType,zoneFile, "; ".join(zoneMasters))
|
|
|
|
|
return template
|
|
|
|
|
else:
|
|
|
|
|
self.setError(_('DNS zone type %s unsupported')%zoneType)
|
|
|
|
|