diff -r ad9d512ec1e7 -r 3bb00e5e79d3 pvl/hosts/zone.py --- a/pvl/hosts/zone.py Wed Feb 25 14:56:59 2015 +0200 +++ b/pvl/hosts/zone.py Wed Feb 25 14:59:48 2015 +0200 @@ -54,18 +54,22 @@ log.info("%s: forward: %s", host, forward) yield pvl.dns.ZoneRecord.CNAME(label, forward) - return + + elif host.forward is None: + # forward + if host.ip : + log.info("%s: forward %s[%s]: A %s", host, origin, label, host.ip) - elif host.forward is not None: + yield pvl.dns.ZoneRecord.A(label, host.ip) + + if host.ip6 : + log.info("%s: forward %s[%s]: AAAA %s", host, origin, label, host.ip6) + + yield pvl.dns.ZoneRecord.AAAA(label, host.ip6) + + else: log.info("%s: skip forward", host) return - - # forward - if host.ip : - yield pvl.dns.ZoneRecord.A(label, host.ip) - - if host.ip6 : - yield pvl.dns.ZoneRecord.AAAA(label, host.ip6) if host.location: location_alias, location_domain = host.location