Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/171769
Change subject: (WIP) generate wikimedia wiki entries from helper
......................................................................
(WIP) generate wikimedia wiki entries from helper
instead of adding the regular and the corresponding
mobile '.m.' entries separately and always be out of sync,
like in the past, create both entries from a helper template
like the existing way we generate WP languages from langs.tmpl
follow-up to bugs like
Bug: 38799
RT: 2996 et al
Change-Id: Iecf21551af1529f0cca31a20f2df6264f1505e92
---
A templates/helpers/wmwikilist.tmpl
A templates/helpers/wmwikis.tmpl
M templates/wikimedia.org
3 files changed, 107 insertions(+), 146 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/69/171769/1
diff --git a/templates/helpers/wmwikilist.tmpl
b/templates/helpers/wmwikilist.tmpl
new file mode 100644
index 0000000..7594cad
--- /dev/null
+++ b/templates/helpers/wmwikilist.tmpl
@@ -0,0 +1,12 @@
+{% from "helpers/wmwikis.tmpl" import wmwikis %}
+
+{% macro wmwikis(wiki) -%}
+{{ wiki }} 600 IN DYNA geoip!text-addrs
+{{ wiki }}.m 600 IN DYNA geoip!mobile-addrs
+{%- endmacro %}
+
+{% macro wmwikilist() -%}
+{% for wmwiki in wmwikis -%}
+{{ wmwikis(lang) }}
+{% endfor %}
+{%- endmacro %}
diff --git a/templates/helpers/wmwikis.tmpl b/templates/helpers/wmwikis.tmpl
new file mode 100644
index 0000000..b23d6fb
--- /dev/null
+++ b/templates/helpers/wmwikis.tmpl
@@ -0,0 +1,93 @@
+{% set wmwikis = [
+ 'advisory',
+ 'affcom',
+ 'auditcom',
+ 'ar',
+ 'bd',
+ 'be',
+ 'board',
+ 'boardgovcom',
+ 'bookshelf',
+ 'br',
+ 'ca',
+ 'ch',
+ 'chair',
+ 'chapcom',
+ 'checkuser',
+ 'co',
+ 'collab',
+ 'comcom',
+ 'commons',
+ 'www.commons',
+ 'dk',
+ 'educacao',
+ 'education',
+ 'et',
+ 'exec',
+ 'fdc',
+ 'fi',
+ 'grants',
+ 'hu',
+ 'iegcom',
+ 'il',
+ 'incubator',
+ 'internal',
+ 'it',
+ 'kr',
+ 'langcom',
+ 'legalteam',
+ 'meta',
+ 'www.meta',
+ 'mk',
+ 'movementroles',
+ 'mx',
+ 'nl',
+ 'www.nl',
+ 'noboard.chapters',
+ 'no',
+ 'noboard-chapters',
+ 'nostalgia',
+ 'nz',
+ 'office',
+ 'ombudsmen',
+ 'otrs-wiki',
+ 'outreach',
+ 'pa.us',
+ 'pa-us',
+ 'pt',
+ 'pk',
+ 'pl',
+ 'quality',
+ 'rs',
+ 'ru',
+ 'se',
+ 'searchcom',
+ 'spcom',
+ 'species',
+ 'steward',
+ 'strategy',
+ 'strategyapps',
+ 'tr',
+ 'transitionteam',
+ 'ua',
+ 'uk',
+ 'usability',
+ 've',
+ 'videos',
+ 'vote',
+ 'wikimania',
+ 'wikimania2005',
+ 'wikimania2006',
+ 'wikimania2007',
+ 'wikimania2008',
+ 'wikimania2009',
+ 'wikimania2010',
+ 'wikimania2011',
+ 'wikimania2012',
+ 'wikimania2013',
+ 'wikimania2014',
+ 'wikimania2015',
+ 'wikimaniateam',
+ 'www',
+ 'zero',
+] %}
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 5a6b434..2258884 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -271,60 +271,6 @@
;;; codfw
dns-rec-lb.codfw 1H IN A 208.80.153.254
1H IN AAAA 2620:0:860:ed1a::3:fe
-
-; Mobile
-
-advisory.m 600 IN DYNA geoip!mobile-addrs
-ar.m 600 IN DYNA geoip!mobile-addrs
-bd.m 600 IN DYNA geoip!mobile-addrs
-be.m 600 IN DYNA geoip!mobile-addrs
-br.m 600 IN DYNA geoip!mobile-addrs
-ca.m 600 IN DYNA geoip!mobile-addrs
-chapcom.m 600 IN DYNA geoip!mobile-addrs
-checkuser.m 600 IN DYNA geoip!mobile-addrs
-co.m 600 IN DYNA geoip!mobile-addrs
-commons.m 600 IN DYNA geoip!mobile-addrs
-dk.m 600 IN DYNA geoip!mobile-addrs
-et.m 600 IN DYNA geoip!mobile-addrs
-incubator.m 600 IN DYNA geoip!mobile-addrs
-fdc.m 600 IN DYNA geoip!mobile-addrs
-fi.m 600 IN DYNA geoip!mobile-addrs
-legalteam.m 600 IN DYNA geoip!mobile-addrs
-login.m 600 IN DYNA geoip!mobile-addrs
-meta.m 600 IN DYNA geoip!mobile-addrs
-mk.m 600 IN DYNA geoip!mobile-addrs
-mx.m 600 IN DYNA geoip!mobile-addrs
-nl.m 600 IN DYNA geoip!mobile-addrs
-no.m 600 IN DYNA geoip!mobile-addrs
-nostalgia.m 600 IN DYNA geoip!mobile-addrs
-nyc.m 600 IN DYNA geoip!mobile-addrs
-nz.m 600 IN DYNA geoip!mobile-addrs
-office.m 600 IN DYNA geoip!mobile-addrs
-outreach.m 600 IN DYNA geoip!mobile-addrs
-quality.m 600 IN DYNA geoip!mobile-addrs
-pa-us.m 600 IN DYNA geoip!mobile-addrs
-pl.m 600 IN DYNA geoip!mobile-addrs
-pt.m 600 IN DYNA geoip!mobile-addrs
-rs.m 600 IN DYNA geoip!mobile-addrs
-ru.m 600 IN DYNA geoip!mobile-addrs
-se.m 600 IN DYNA geoip!mobile-addrs
-species.m 600 IN DYNA geoip!mobile-addrs
-steward.m 600 IN DYNA geoip!mobile-addrs
-strategy.m 600 IN DYNA geoip!mobile-addrs
-tr.m 600 IN DYNA geoip!mobile-addrs
-ua.m 600 IN DYNA geoip!mobile-addrs
-usability.m 600 IN DYNA geoip!mobile-addrs
-vote.m 600 IN DYNA geoip!mobile-addrs
-wikimania2007.m 600 IN DYNA geoip!mobile-addrs
-wikimania2008.m 600 IN DYNA geoip!mobile-addrs
-wikimania2009.m 600 IN DYNA geoip!mobile-addrs
-wikimania2010.m 600 IN DYNA geoip!mobile-addrs
-wikimania2011.m 600 IN DYNA geoip!mobile-addrs
-wikimania2012.m 600 IN DYNA geoip!mobile-addrs
-wikimania2013.m 600 IN DYNA geoip!mobile-addrs
-wikimania2014.m 600 IN DYNA geoip!mobile-addrs
-wikimania2015.m 600 IN DYNA geoip!mobile-addrs
-
; Networking
cr1-codfw 1H IN A 208.80.153.192
@@ -493,99 +439,9 @@
url-downloader 1H IN A 208.80.154.156 ; chromium
-; Wikis (alphabetic order)
+; Wikis (regular and mobile)
-advisory 600 IN DYNA geoip!text-addrs
-affcom 600 IN DYNA geoip!text-addrs
-auditcom 600 IN DYNA geoip!text-addrs
-ar 600 IN DYNA geoip!text-addrs
-bd 600 IN DYNA geoip!text-addrs
-be 600 IN DYNA geoip!text-addrs
-board 600 IN DYNA geoip!text-addrs
-boardgovcom 600 IN DYNA geoip!text-addrs
-bookshelf 600 IN DYNA geoip!text-addrs
-br 600 IN DYNA geoip!text-addrs
-ca 600 IN DYNA geoip!text-addrs
-ch 600 IN DYNA geoip!text-addrs
-chair 600 IN DYNA geoip!text-addrs
-chapcom 600 IN DYNA geoip!text-addrs
-checkuser 600 IN DYNA geoip!text-addrs
-co 600 IN DYNA geoip!text-addrs
-collab 600 IN DYNA geoip!text-addrs
-comcom 600 IN DYNA geoip!text-addrs
-commons 600 IN DYNA geoip!text-addrs
-www.commons 600 IN DYNA geoip!text-addrs
-dk 600 IN DYNA geoip!text-addrs
-educacao 600 IN DYNA geoip!text-addrs
-education 600 IN DYNA geoip!text-addrs
-et 600 IN DYNA geoip!text-addrs
-exec 600 IN DYNA geoip!text-addrs
-fdc 600 IN DYNA geoip!text-addrs
-fi 600 IN DYNA geoip!text-addrs
-grants 600 IN DYNA geoip!text-addrs
-hu 600 IN DYNA geoip!text-addrs
-iegcom 600 IN DYNA geoip!text-addrs
-il 600 IN DYNA geoip!text-addrs
-incubator 600 IN DYNA geoip!text-addrs
-internal 600 IN DYNA geoip!text-addrs
-it 600 IN DYNA geoip!text-addrs
-kr 600 IN DYNA geoip!text-addrs
-langcom 600 IN DYNA geoip!text-addrs
-legalteam 600 IN DYNA geoip!text-addrs
-meta 600 IN DYNA geoip!text-addrs
-www.meta 600 IN DYNA geoip!text-addrs
-mk 600 IN DYNA geoip!text-addrs
-movementroles 600 IN DYNA geoip!text-addrs
-mx 600 IN DYNA geoip!text-addrs
-nl 600 IN DYNA geoip!text-addrs
-www.nl 600 IN DYNA geoip!text-addrs
-noboard.chapters 600 IN DYNA geoip!text-addrs
-no 600 IN DYNA geoip!text-addrs
-noboard-chapters 600 IN DYNA geoip!text-addrs
-nostalgia 600 IN DYNA geoip!text-addrs
-nz 600 IN DYNA geoip!text-addrs
-office 600 IN DYNA geoip!text-addrs
-ombudsmen 600 IN DYNA geoip!text-addrs
-otrs-wiki 600 IN DYNA geoip!text-addrs
-outreach 600 IN DYNA geoip!text-addrs
-pa.us 600 IN DYNA geoip!text-addrs
-pa-us 600 IN DYNA geoip!text-addrs
-pt 600 IN DYNA geoip!text-addrs
-pk 600 IN DYNA geoip!text-addrs
-pl 600 IN DYNA geoip!text-addrs
-quality 600 IN DYNA geoip!text-addrs
-rs 600 IN DYNA geoip!text-addrs
-ru 600 IN DYNA geoip!text-addrs
-se 600 IN DYNA geoip!text-addrs
-searchcom 600 IN DYNA geoip!text-addrs
-spcom 600 IN DYNA geoip!text-addrs
-species 600 IN DYNA geoip!text-addrs
-steward 600 IN DYNA geoip!text-addrs
-strategy 600 IN DYNA geoip!text-addrs
-strategyapps 600 IN DYNA geoip!text-addrs
-tr 600 IN DYNA geoip!text-addrs
-transitionteam 600 IN DYNA geoip!text-addrs
-ua 600 IN DYNA geoip!text-addrs
-uk 600 IN DYNA geoip!text-addrs
-usability 600 IN DYNA geoip!text-addrs
-ve 600 IN DYNA geoip!text-addrs
-videos 600 IN DYNA geoip!text-addrs
-vote 600 IN DYNA geoip!text-addrs
-wikimania 600 IN DYNA geoip!text-addrs
-wikimania2005 600 IN DYNA geoip!text-addrs
-wikimania2006 600 IN DYNA geoip!text-addrs
-wikimania2007 600 IN DYNA geoip!text-addrs
-wikimania2008 600 IN DYNA geoip!text-addrs
-wikimania2009 600 IN DYNA geoip!text-addrs
-wikimania2010 600 IN DYNA geoip!text-addrs
-wikimania2011 600 IN DYNA geoip!text-addrs
-wikimania2012 600 IN DYNA geoip!text-addrs
-wikimania2013 600 IN DYNA geoip!text-addrs
-wikimania2014 600 IN DYNA geoip!text-addrs
-wikimania2015 600 IN DYNA geoip!text-addrs
-wikimaniateam 600 IN DYNA geoip!text-addrs
-www 600 IN DYNA geoip!text-addrs
-zero 600 IN DYNA geoip!text-addrs
+{{ wmwikilist() }}
; Other websites (NO wikis!)
analytics 1H IN CNAME stat1001
--
To view, visit https://gerrit.wikimedia.org/r/171769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecf21551af1529f0cca31a20f2df6264f1505e92
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
