BBlack has submitted this change and it was merged.
Change subject: remove redundant wikimedia.org. trailers
......................................................................
remove redundant wikimedia.org. trailers
Functional no-op. All hostnames in the wikimedia.org zonefile
which are not fully qualified implicitly end in "wikimedia.org.",
and this normalizes them to their short form (again, for easier
regex operations).
Change-Id: I0f096146e918ebf036744f688791963d144007f2
---
M templates/wikimedia.org
1 file changed, 28 insertions(+), 30 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 086c6f0..cd382db 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -1,24 +1,24 @@
; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
-@ 1D IN SOA ns0.wikimedia.org. hostmaster.wikimedia.org. (
+@ 1D IN SOA ns0 hostmaster (
{{ serial }} ; serial
12H ; refresh
2H ; retry
2W ; expiry
600 ; negative cache TTL
- )
+ )
; Name servers
- 1D IN NS ns0.wikimedia.org.
- 1D IN NS ns1.wikimedia.org.
- 1D IN NS ns2.wikimedia.org.
+ 1D IN NS ns0
+ 1D IN NS ns1
+ 1D IN NS ns2
; Mail exchangers
- 1H IN MX 10 mx1001.wikimedia.org.
- 1H IN MX 50 mx2001.wikimedia.org.
+ 1H IN MX 10 mx1001
+ 1H IN MX 50 mx2001
; Canonical names
600 IN DYNA geoip!text-addrs
@@ -86,8 +86,8 @@
misc-web-lb 600 DYNA geoip!misc-addrs
geoiplookup 600 DYNA geoip!geoiplookup-addrs
donate 600 DYNA geoip!text-addrs
- 1H IN MX 10 mx1001.wikimedia.org.
- 1H IN MX 50 mx2001.wikimedia.org.
+ 1H IN MX 10 mx1001
+ 1H IN MX 50 mx2001
; Servers (alphabetic order) << WHAT PART ABOUT THIS IS SO HARD TO UNDERSTAND?
@@ -223,8 +223,8 @@
1H IN AAAA 2620:0:861:ed1a::2:d
misc-web-lb.eqiad 600 IN DYNA geoip!misc-addrs/eqiad
donate-lb.eqiad 600 IN DYNA geoip!text-addrs/eqiad
- IN MX 10 mx1001.wikimedia.org.
- IN MX 50 mx2001.wikimedia.org.
+ IN MX 10 mx1001
+ IN MX 50 mx2001
;;; ns0 208.80.154.238
dns-rec-lb.eqiad 1H IN A 208.80.154.239
1H IN AAAA 2620:0:861:ed1a::3:fe
@@ -258,8 +258,8 @@
misc-web-lb.ulsfo 600 IN DYNA geoip!misc-addrs/ulsfo
geoiplookup-lb.ulsfo 600 IN DYNA geoip!geoiplookup-addrs/ulsfo
donate-lb.ulsfo 600 IN DYNA geoip!text-addrs/ulsfo
- 1H IN MX 10 mx1001.wikimedia.org.
- 1H IN MX 50 mx2001.wikimedia.org.
+ 1H IN MX 10 mx1001
+ 1H IN MX 50 mx2001
;;; codfw
dns-rec-lb.codfw 1H IN A 208.80.153.254
@@ -284,8 +284,8 @@
misc-web-lb.esams 600 IN DYNA geoip!misc-addrs/esams
geoiplookup-lb.esams 600 IN DYNA geoip!geoiplookup-addrs/esams
donate-lb.esams 600 IN DYNA geoip!text-addrs/esams
- 1H IN MX 10 mx1001.wikimedia.org.
- 1H IN MX 50 mx2001.wikimedia.org.
+ 1H IN MX 10 mx1001
+ 1H IN MX 50 mx2001
dns-rec-lb.esams 1H IN A 91.198.174.216
1H IN AAAA 2620:0:862:ed1a::3:fe
@@ -452,8 +452,8 @@
benefactorevents 1H IN CNAME trilogytools1.azurewebsites.net.
benefactors 600 IN DYNA geoip!text-addrs
- 1H IN MX 10 mx1001.wikimedia.org.
- 1H IN MX 50 mx2001.wikimedia.org.
+ 1H IN MX 10 mx1001
+ 1H IN MX 50 mx2001
1H IN TXT "v=spf1 include:wikimedia.org
include:jangomail.com ?all"
benefactors._domainkey.benefactors 1H IN TXT "v=DKIM1; k=rsa;
p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCu1t0FbSFXbsTxY9T10Lgfx4V0J2L8T6KkIgx3gouCJUinv3+9P32h/JJCgjzFv/wqm6nL2lttPJbC5/FKZ/v3OTPdv4OuQX9EfhIFMetgw1gDyAmhvVEgnSzhTlylLRV3HvZSmQN1AUblyqgBv9fa0wbMTprlgzlyI/oLwhLHwQIDAQAB"
@@ -468,17 +468,15 @@
doc 600 IN DYNA geoip!misc-addrs
docs 600 IN DYNA geoip!text-addrs
eventdonations 1H IN CNAME
contrib-wi-10109-10472-20140728-1682402186.us-east-1.elb.amazonaws.com.
-ldap-corp.eqiad 1H IN CNAME dubnium.wikimedia.org.
-ldap-corp.codfw 1H IN CNAME pollux.wikimedia.org.
-ldap-labs.eqiad 1H IN CNAME seaborgium.wikimedia.org.
-ldap-labs.codfw 1H IN CNAME serpens.wikimedia.org.
+ldap-corp.eqiad 1H IN CNAME dubnium
+ldap-corp.codfw 1H IN CNAME pollux
+ldap-labs.eqiad 1H IN CNAME seaborgium
+ldap-labs.codfw 1H IN CNAME serpens
-labs-puppetmaster-eqiad 300 IN CNAME labcontrol1001.wikimedia.org.
-labtest-puppetmaster-codfw 300 IN CNAME labtestcontrol2001.wikimedia.org.
+labs-puppetmaster-eqiad 300 IN CNAME labcontrol1001
+labtest-puppetmaster-codfw 300 IN CNAME labtestcontrol2001
-
-; don't want this for anything but wikimedia.org domain
-frdata.wikimedia.org. 1H IN CNAME frdata-eqiad.wikimedia.org.
+frdata 1H IN CNAME frdata-eqiad
gerrit 1H IN A 208.80.154.81
1H IN AAAA 2620:0:861:3:208:80:154:81
@@ -499,8 +497,8 @@
ldap-codfw 1H IN CNAME serpens
phabricator 600 IN DYNA geoip!misc-addrs
- 1H IN MX 10 mx1001.wikimedia.org.
- 1H IN MX 50 mx2001.wikimedia.org.
+ 1H IN MX 10 mx1001
+ 1H IN MX 50 mx2001
login 600 IN DYNA geoip!text-addrs
@@ -526,8 +524,8 @@
reports.frdev 1H IN CNAME frdev-eqiad
rt 5M IN A 208.80.154.5
- 1H IN MX 10 mx1001.wikimedia.org.
- 1H IN MX 50 mx2001.wikimedia.org.
+ 1H IN MX 10 mx1001
+ 1H IN MX 50 mx2001
secure 600 IN DYNA geoip!text-addrs
--
To view, visit https://gerrit.wikimedia.org/r/278723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f096146e918ebf036744f688791963d144007f2
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
