Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/304155

Change subject: wikimedia.org: repeat hostname on each line for multi records
......................................................................

wikimedia.org: repeat hostname on each line for multi records

Change-Id: I7867aca7bfaa2ef7625edf892497055110ced474
---
M templates/wikimedia.org
1 file changed, 61 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/55/304155/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 03e163f..0657dcc 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -60,9 +60,9 @@
 dumps           1H  IN CNAME dataset1001
 
 lists           1H  IN A    208.80.154.75
-                1H  IN AAAA 2620:0:861:3::2
-                1H  IN MX   10 lists
-                1H  IN TXT  "v=spf1 mx ?all"
+lists           1H  IN AAAA 2620:0:861:3::2
+lists           1H  IN MX   10 lists
+lists           1H  IN TXT  "v=spf1 mx ?all"
 
 wiki-mail       1H  IN CNAME    mx1001    ; used by Jenkins and possibly others
 
@@ -88,62 +88,61 @@
 ; Servers (alphabetic order) << WHAT PART ABOUT THIS IS SO HARD TO UNDERSTAND?
 
 acamar          1H  IN A    208.80.153.12
-                1H  IN AAAA 2620:0:860:1:208:80:153:12
+acamar          1H  IN AAAA 2620:0:860:1:208:80:153:12
 achernar        1H  IN A    208.80.153.42
-                1H  IN AAAA 2620:0:860:2:208:80:153:42
+achernar        1H  IN AAAA 2620:0:860:2:208:80:153:42
 alsafi          1H  IN A    208.80.153.50
-                1H  IN AAAA 2620:0:860:2:208:80:153:50
+alsafi          1H  IN AAAA 2620:0:860:2:208:80:153:50
 astatine        1H  IN A    208.80.155.110
 baham           1H  IN A    208.80.153.13
-                1H  IN AAAA 2620:0:860:1:208:80:153:13
+baham           1H  IN AAAA 2620:0:860:1:208:80:153:13
 barium          1H  IN A    208.80.155.11
 bast1001        1H  IN A    208.80.154.149
-                1H  IN AAAA 2620:0:861:2:208:80:154:149
+bast1001        1H  IN AAAA 2620:0:861:2:208:80:154:149
 bast2001        1H  IN A    208.80.153.5
-                1H  IN AAAA 2620:0:860:1:208:80:153:5
+bast2001        1H  IN AAAA 2620:0:860:1:208:80:153:5
 bast3001        1H  IN A    91.198.174.112
-                1H  IN AAAA 2620:0:862:1:91:198:174:112
+bast3001        1H  IN AAAA 2620:0:862:1:91:198:174:112
 bast4001        1H  IN A    198.35.26.5
-                1H  IN AAAA 2620:0:863:1:198:35:26:5
+bast4001        1H  IN AAAA 2620:0:863:1:198:35:26:5
 californium     1H  IN A    208.80.154.147
 carbon          1H  IN A    208.80.154.10
-                1H  IN AAAA 2620:0:861:1:208:80:154:10
+carbon          1H  IN AAAA 2620:0:861:1:208:80:154:10
 chromium        1H  IN A    208.80.154.157
-                1H  IN AAAA 2620:0:861:2:208:80:154:157
+chromium        1H  IN AAAA 2620:0:861:2:208:80:154:157
 dubnium         1H  IN A    208.80.154.77
 cp1008          1H  IN A    208.80.154.42
 dataset1001     1H  IN A    208.80.154.11
-                1H  IN AAAA 2620:0:861:1:208:80:154:11
+dataset1001     1H  IN AAAA 2620:0:861:1:208:80:154:11
 eeden           1H  IN A    91.198.174.121
-                1H  IN AAAA 2620:0:862:1:91:198:174:121
+eeden           1H  IN AAAA 2620:0:862:1:91:198:174:121
 einsteinium     1H  IN A    208.80.155.119
 fermium         1H  IN A    208.80.154.74 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
-                1H  IN AAAA 2620:0:861:3:208:80:154:74
+fermium         1H  IN AAAA 2620:0:861:3:208:80:154:74
 frdata-eqiad      1H  IN A    208.80.155.10
 frdev-eqiad       1H  IN A    208.80.155.13
 fundraising-eqiad 1H  IN A    208.80.155.14
-
 gallium         1H  IN A    208.80.154.135
 labservices1002 1H  IN A    208.80.154.12
 hydrogen        1H  IN A    208.80.154.50
-                1H  IN AAAA 2620:0:861:1:208:80:154:50
+hydrogen        1H  IN AAAA 2620:0:861:1:208:80:154:50
 install1001     1H  IN A    208.80.154.83
-                1H  IN AAAA 2620:0:861:3:208:80:154:83
+install1001     1H  IN AAAA 2620:0:861:3:208:80:154:83
 install2001     1H  IN A    208.80.153.4
-                1H  IN AAAA 2620:0:860:1:208:80:153:4
+install2001     1H  IN AAAA 2620:0:860:1:208:80:153:4
 iron            1H  IN A    208.80.154.151
-                1H  IN AAAA 2620:0:861:2:208:80:154:151
+iron            1H  IN AAAA 2620:0:861:2:208:80:154:151
 kraz            1H  IN A    208.80.153.44
-                1H  IN AAAA 2620:0:860:2:208:80:153:44
+kraz            1H  IN AAAA 2620:0:860:2:208:80:153:44
 labcontrol1001      1H  IN A    208.80.154.92
 labcontrol1002      1H  IN A    208.80.154.95
 labtestweb2001      1H  IN A    208.80.153.14
-                    1H  IN AAAA 2620:0:860:1:208:80:153:14
+labtestweb2001      1H  IN AAAA 2620:0:860:1:208:80:153:14
 labservices1001     1H  IN A    208.80.155.117
 labtestcontrol2001  1H  IN A    208.80.153.47
 labtestservices2001 1H  IN A    208.80.153.48
 lead            1H  IN A    208.80.154.82
-                1H  IN AAAA 2620:0:861:3:208:80:154:82
+lead            1H  IN AAAA 2620:0:861:3:208:80:154:82
 lvs1001         1H  IN A    208.80.154.55
 lvs1002         1H  IN A    208.80.154.56
 lvs1003         1H  IN A    208.80.154.57
@@ -151,50 +150,50 @@
 lvs1005         1H  IN A    208.80.154.138
 lvs1006         1H  IN A    208.80.154.139
 maerlant        1H  IN A    91.198.174.122
-                1H  IN AAAA 2620:0:862:1:91:198:174:122
+maerlant        1H  IN AAAA 2620:0:862:1:91:198:174:122
 meitnerium      1H  IN A    208.80.154.73 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 sodium          1H  IN A    208.80.154.15
-                1H  IN AAAA 2620:0:861:1:208:80:154:15
+sodium          1H  IN AAAA 2620:0:861:1:208:80:154:15
 ms1001          1H  IN A    208.80.154.16
-                1H  IN AAAA 2620:0:861:1:208:80:154:16
+ms1001          1H  IN AAAA 2620:0:861:1:208:80:154:16
 multatuli       1H  IN A    91.198.174.114
-                1H  IN AAAA 2620:0:862:1:91:198:174:114
+multatuli       1H  IN AAAA 2620:0:862:1:91:198:174:114
 mx1001          1H  IN A    208.80.154.76 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
-                1H  IN AAAA 2620:0:861:3:208:80:154:76
+mx1001          1H  IN AAAA 2620:0:861:3:208:80:154:76
 mx2001          1H  IN A    208.80.153.45 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
-                1H  IN AAAA 2620:0:860:2:208:80:153:45
+mx2001          1H  IN AAAA 2620:0:860:2:208:80:153:45
 nescio          1H  IN A    91.198.174.106
-                1H  IN AAAA 2620:0:862:1:91:198:174:106
+nescio          1H  IN AAAA 2620:0:862:1:91:198:174:106
 neon            1H  IN A    208.80.154.14
-                1H  IN AAAA 2620:0:861:1:208:80:154:14
+neon            1H  IN AAAA 2620:0:861:1:208:80:154:14
 netmon1001      1H  IN A    208.80.154.159
-                1H  IN AAAA 2620:0:861:2:208:80:154:159
+netmon1001      1H  IN AAAA 2620:0:861:2:208:80:154:159
 pay-lvs1001     1H  IN A    208.80.155.2
 pay-lvs1002     1H  IN A    208.80.155.3
 pollux          1H  IN A    208.80.153.43
 procyon         1H  IN A    208.80.152.245
 radium          1H  IN A    208.80.154.39
-                1H  IN AAAA 2620:0:861:1:208:80:154:39
+radium          1H  IN AAAA 2620:0:861:1:208:80:154:39
 radon           1H  IN A    208.80.154.93
-                1H  IN AAAA 2620:0:861:3:208:80:154:93
+radon           1H  IN AAAA 2620:0:861:3:208:80:154:93
 rhenium         1H  IN A    208.80.154.52
 rigel           1H  IN A    208.80.152.231
 ripe-atlas-eqiad     1H  IN A    208.80.155.69
-            1H  IN AAAA 2620:0:861:202:208:80:155:69
+ripe-atlas-eqiad     1H  IN AAAA 2620:0:861:202:208:80:155:69
 ripe-atlas-codfw     1H  IN A    208.80.152.244
-            1H  IN AAAA 2620:0:860:201:208:80:152:244
+ripe-atlas-codfw     1H  IN AAAA 2620:0:860:201:208:80:152:244
 ripe-atlas-ulsfo     1H  IN A    198.35.26.244
-            1H  IN AAAA 2620:0:863:201:198:35:26:244
+ripe-atlas-ulsfo     1H  IN AAAA 2620:0:863:201:198:35:26:244
 seaborgium      1H  IN A    208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 serpens         1H  IN A    208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver          1H  IN A    208.80.154.136
-                1H  IN AAAA 2620:0:861:2:208:80:154:136
+silver          1H  IN AAAA 2620:0:861:2:208:80:154:136
 tegmen          1H  IN A    208.80.153.74
 tellurium       1H  IN A    208.80.155.9
 titanium        1H  IN A    208.80.154.154
 ununpentium     1H  IN A    208.80.154.84
 uranium         1H  IN A    208.80.154.53
-                1H  IN AAAA 2620:0:861:1:208:80:154:53
+uranium         1H  IN AAAA 2620:0:861:1:208:80:154:53
 virt1000        1H  IN A    208.80.154.18
 
 
@@ -220,11 +219,11 @@
 maps-lb.eqiad       600 IN DYNA geoip!maps-addrs/eqiad
 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
-                IN MX 50 mx2001
+donate-lb.eqiad         IN MX 10 mx1001
+donate-lb.eqiad         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
+dns-rec-lb.eqiad    1H  IN AAAA 2620:0:861:ed1a::3:fe
 
 geoiplookup-lb.eqiad    600 IN DYNA geoip!geoiplookup-addrs/eqiad
 
@@ -240,9 +239,9 @@
 rest                600 IN DYNA geoip!text-addrs
 
 git-ssh.eqiad       1H  IN A    208.80.154.250
-                    1H  IN AAAA 2620:0:861:ed1a::3:16
+git-ssh.eqiad       1H  IN AAAA 2620:0:861:ed1a::3:16
 git-ssh             1H  IN A    208.80.154.250
-                    1H  IN AAAA 2620:0:861:ed1a::3:16
+git-ssh             1H  IN AAAA 2620:0:861:ed1a::3:16
 
 ;;; ulsfo
 text-lb.ulsfo       600 IN DYNA geoip!text-addrs/ulsfo
@@ -251,12 +250,12 @@
 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
-            1H  IN MX 50    mx2001
+donate-lb.ulsfo     1H  IN MX 10    mx1001
+donate-lb.ulsfo     1H  IN MX 50    mx2001
 
 ;;; codfw
 dns-rec-lb.codfw    1H  IN A    208.80.153.254
-                    1H  IN AAAA 2620:0:860:ed1a::3:fe
+dns-rec-lb.codfw    1H  IN AAAA 2620:0:860:ed1a::3:fe
 text-lb.codfw       600 IN DYNA geoip!text-addrs/codfw
 upload-lb.codfw     600 IN DYNA geoip!upload-addrs/codfw
 maps-lb.codfw       600 IN DYNA geoip!maps-addrs/codfw
@@ -271,10 +270,10 @@
 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
-              1H  IN MX 50    mx2001
+donate-lb.esams     1H  IN MX 10    mx1001
+donate-lb.esams     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
+dns-rec-lb.esams    1H  IN AAAA 2620:0:862:ed1a::3:fe
 
 ; Mobile
 
@@ -438,9 +437,9 @@
 
 benefactorevents 1H IN CNAME    trilogytools1.azurewebsites.net.
 benefactors     600 IN DYNA     geoip!text-addrs
-                1H  IN MX       10 mx1001
-                1H  IN MX       50 mx2001
-                1H  IN TXT      "v=spf1 include:wikimedia.org 
include:spf.mandrillapp.com -all"
+benefactors      1H  IN MX       10 mx1001
+benefactors      1H  IN MX       50 mx2001
+benefactors      1H  IN TXT      "v=spf1 include:wikimedia.org 
include:spf.mandrillapp.com -all"
 mandrill._domainkey.benefactors 1H IN TXT "v=DKIM1; k=rsa; 
p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrLHiExVd55zd/IQ/J/mRwSRMAocV/hMB3jXwaHH36d9NaVynQFYV8NaWi69c1veUtRzGt7yAioXqLj7Z4TeEUoOLgrKsn8YnckGs9i3B3tVFB+Ch/4mPhXWiNfNdynHWBcPcbJ8kjEQ2U8y78dHZj1YeRXXVvWob2OaKynO8/lQIDAQAB;"
 
 
@@ -462,13 +461,13 @@
 ldap-labs.eqiad 1H  IN CNAME    seaborgium
 ldap-labs.codfw 1H  IN CNAME    serpens
 
-labs-puppetmaster-eqiad 300 IN CNAME  labcontrol1001
+labs-puppetmaster-eqiad    300 IN CNAME  labcontrol1001
 labtest-puppetmaster-codfw 300 IN CNAME  labtestcontrol2001
 
 frdata          1H  IN CNAME    frdata-eqiad
 
 gerrit          600 IN A        208.80.154.85
-                600 IN AAAA     2620:0:861:3:208:80:154:85
+gerrit          600 IN AAAA     2620:0:861:3:208:80:154:85
 git             600 IN DYNA     geoip!misc-addrs
 graphite        600 IN DYNA     geoip!misc-addrs
 graphite-labs   600 IN DYNA     geoip!misc-addrs
@@ -517,8 +516,8 @@
 reports.frdev   1H  IN CNAME    frdev-eqiad
 
 rt              600 IN DYNA     geoip!misc-addrs
-                1H  IN MX       10 mx1001
-                1H  IN MX       50 mx2001
+rt              1H  IN MX       10 mx1001
+rt              1H  IN MX       50 mx2001
 
 secure          600 IN DYNA     geoip!text-addrs
 
@@ -529,9 +528,9 @@
 torrus          600 IN DYNA     geoip!misc-addrs
 
 wiki-mail-eqiad 1H  IN A        208.80.154.91
-                1H  IN AAAA     2620:0:861:3:208:80:154:91
+wiki-mail-eqiad 1H  IN AAAA     2620:0:861:3:208:80:154:91
 wiki-mail-codfw 1H  IN A        208.80.153.46
-                1H  IN AAAA     2620:0:860:2:208:80:153:46
+wiki-mail-codfw 1H  IN AAAA     2620:0:860:2:208:80:153:46
 
 url-downloader.eqiad  1H  IN A          208.80.154.156  ; chromium
 url-downloader.codfw  1H  IN A          208.80.153.50
@@ -708,7 +707,7 @@
 static-bugzilla  600 IN DYNA     geoip!misc-addrs
 stats            600 IN DYNA     geoip!misc-addrs
 status           1H  IN A        162.209.126.221
-                 1H  IN AAAA     2001:4802:7800:1:be76:4eff:fe21:3782
+status           1H  IN AAAA     2001:4802:7800:1:be76:4eff:fe21:3782
 techblog         600 IN DYNA     geoip!text-addrs
 ticket           600 IN DYNA     geoip!misc-addrs
 tor-eqiad-1      1H  IN CNAME    radium
@@ -717,7 +716,7 @@
 yarn             600 IN DYNA     geoip!misc-addrs
 wikitech         1H  IN CNAME    silver
 wikitech-static  1H  IN A        162.209.126.221
-                 1H  IN AAAA     2001:4802:7800:1:be76:4eff:fe21:3782
+wikitech-static  1H  IN AAAA     2001:4802:7800:1:be76:4eff:fe21:3782
 labtestwikitech  1H  IN CNAME    labtestweb2001
 labtesthorizon   1H  IN DYNA     geoip!misc-addrs
 labtestspice     1H  IN DYNA     geoip!misc-addrs

-- 
To view, visit https://gerrit.wikimedia.org/r/304155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7867aca7bfaa2ef7625edf892497055110ced474
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to