mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

get-zones should comment out NAMESERVER() (#743)

Browse Source 
* get-zones should comment out NAMESERVER()

* Edits
This commit is contained in:
Tom Limoncelli
2020-05-22 10:20:10 -04:00
committed by GitHub
parent d52c98782c
commit 6348b1d995
6 changed files with 65 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands/getZones.go
View File

@@ -275,8 +275,10 @@ func formatDsl(zonename string, rec *models.RecordConfig, defaultTTL uint32) str
// TODO(tlim): If this is an SPF record, generate a SPF_BUILDER().
case "NS":
// NS records at the apex should be NAMESERVER() records.
// DnsControl uses the API to get this info. NAMESERVER() is just
// to override that when needed.
if rec.Name == "@" {
return fmt.Sprintf("NAMESERVER('%s')", target)
return fmt.Sprintf("//NAMESERVER('%s')", target)
}
target = "'" + target + "'"
case "R53_ALIAS":

8
commands/test_data/example.org.zone.js
View File

@@ -4,10 +4,10 @@ D("example.org", REG_CHANGEME,
DnsProvider(bind),
DefaultTTL(7200),
//SOA('@', 'ns1.example.org.', 'hostmaster.example.org.', 2020030700, 7200, 3600, 864000, 7200, TTL(43200)),
NAMESERVER('ns1.example.org.'),
NAMESERVER('ns2.example.org.'),
NAMESERVER('ns-a.example.net.'),
NAMESERVER('friend-dns.example.com.'),
//NAMESERVER('ns1.example.org.'),
//NAMESERVER('ns2.example.org.'),
//NAMESERVER('ns-a.example.net.'),
//NAMESERVER('friend-dns.example.com.'),
MX('@', 10, 'mx.example.org.'),
TXT('@', 'v=spf1 ip4:192.0.2.25 ip6:2001:db8::1:25 mx include:_spf.example.com ~all'),
SRV('_client._smtp', 1, 1, 1, 'example.org.'),

8
commands/test_data/simple.com.zone.js
View File

@@ -3,10 +3,10 @@ var REG_CHANGEME = NewRegistrar("ThirdParty", "NONE");
D("simple.com", REG_CHANGEME,
DnsProvider(bind),
//SOA('@', 'ns3.serverfault.com.', 'sysadmin.stackoverflow.com.', 2020022300, 3600, 600, 604800, 1440),
NAMESERVER('ns-1313.awsdns-36.org.'),
NAMESERVER('ns-736.awsdns-28.net.'),
NAMESERVER('ns-cloud-c1.googledomains.com.'),
NAMESERVER('ns-cloud-c2.googledomains.com.'),
//NAMESERVER('ns-1313.awsdns-36.org.'),
//NAMESERVER('ns-736.awsdns-28.net.'),
//NAMESERVER('ns-cloud-c1.googledomains.com.'),
//NAMESERVER('ns-cloud-c2.googledomains.com.'),
MX('@', 1, 'aspmx.l.google.com.'),
MX('@', 5, 'alt1.aspmx.l.google.com.'),
MX('@', 5, 'alt2.aspmx.l.google.com.'),