http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59104
Revision: 59104
Author: root
Date: 2009-11-15 17:12:58 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
wikimedia-task-dns-auth (0.11) hardy; urgency=low
* Refactored authdns-update into separate scripts
* Removed directory scenarios/yaseo-down
* Renamed directory knams-down to esams-down
* Changed zwinger into fenari in /etc/default/wikimedia-task-dns-auth
* Depend on pnds > 2.9.22
* Add script authdns-local-update
Modified Paths:
--------------
trunk/debs/wikimedia-task-dns-auth/authdns-update
trunk/debs/wikimedia-task-dns-auth/debian/changelog
trunk/debs/wikimedia-task-dns-auth/debian/conffiles
trunk/debs/wikimedia-task-dns-auth/debian/control
trunk/debs/wikimedia-task-dns-auth/debian/rules
trunk/debs/wikimedia-task-dns-auth/debian/wikimedia-task-dns-auth-default
Added Paths:
-----------
trunk/debs/wikimedia-task-dns-auth/authdns-local-update
trunk/debs/wikimedia-task-dns-auth/gen-dblist-cnames
trunk/debs/wikimedia-task-dns-auth/gen-langlist-cnames
trunk/debs/wikimedia-task-dns-auth/scenarios/esams-down/
Removed Paths:
-------------
trunk/debs/wikimedia-task-dns-auth/scenarios/knams-down/
trunk/debs/wikimedia-task-dns-auth/scenarios/yaseo-down/
Added: trunk/debs/wikimedia-task-dns-auth/authdns-local-update
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/authdns-local-update
(rev 0)
+++ trunk/debs/wikimedia-task-dns-auth/authdns-local-update 2009-11-15
17:12:58 UTC (rev 59104)
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Shell script that pulls zone templates from the "master" DNS server,
+# and regenerates them locally.
+#
+# Written on 2009/11/15 by Mark Bergsma <m...@wikimedia.org>
+
+set -e
+
+CONFFILE=/etc/default/wikimedia-task-dns-auth
+MASTER=""
+POWERDNSDIR=/etc/powerdns
+SCRIPTDIR=/usr/lib/wikimedia-task-dns-auth/bin
+
+export RSYNC_RSH="ssh -i /root/.ssh/wikimedia-task-dns-auth"
+
+PATH=/bin:/usr/bin
+
+# Source the configuration file
+[ -f $CONFFILE ] && source $CONFFILE
+
+# If no master is given on the command line, use the first one in
/etc/default/wikimedia-task-dns-auth
+if [ -z "$1" ]; then
+ MASTER=$(echo $NAMESERVERS | cut -d' ' -f1 )
+else
+ MASTER=$1
+fi
+
+rsync --delete -av $MASTER:$POWERDNSDIR/dblist-cnames $POWERDNSDIR/
+rsync --delete -av $MASTER:$POWERDNSDIR/langlist-cnames $POWERDNSDIR/
+rsync --delete -av $MASTER:$POWERDNSDIR/participants $POWERDNSDIR/
+rsync --delete -av $MASTER:$POWERDNSDIR/templates $POWERDNSDIR/
+rsync --delete -av $MASTER:$POWERDNSDIR/scenarios $POWERDNSDIR/
+rsync --delete -av $MASTER:$POWERDNSDIR/geomaps $POWERDNSDIR/
+
+$SCRIPTDIR/gen-zones
+$SCRIPTDIR/gen-bind.conf
+
+pdns_control reload
+pdns_control rediscover
Property changes on: trunk/debs/wikimedia-task-dns-auth/authdns-local-update
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/debs/wikimedia-task-dns-auth/authdns-update
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/authdns-update 2009-11-15 16:05:22 UTC
(rev 59103)
+++ trunk/debs/wikimedia-task-dns-auth/authdns-update 2009-11-15 17:12:58 UTC
(rev 59104)
@@ -53,24 +53,15 @@
# Generate a new list of language CNAMEs
echo "Syncing langlist"
rsync -t $LANGLISTSOURCE $LANGLIST || true
-echo "Generating language subdomains CNAME file from $LANGLIST"
-[ $LANGLIST -nt $POWERDNSDIR/langlist-cnames ] && < $LANGLIST awk '{ print
$1"\t\t\t1H\tIN CNAME\trr.wikimedia.org."; print"www."$1"\t\t\t1H\tIN
CNAME\trr.wikimedia.org."; print $1".m\t\t\t1H\tIN
CNAME\tmobile1.wikimedia.org." }' > $POWERDNSDIR/langlist-cnames
echo "Syncing all.dblist"
rsync -t $DBLISTSOURCE $DBLIST || true
+
+echo "Generating language subdomains CNAME file from $LANGLIST"
+$SCRIPTDIR/gen-langlist-cnames
+
echo "Generating wiki toolserver CNAMEs from $DBLIST"
-(
-while read line; do
- line=`echo $line | tr _ -`
- if echo $line | egrep -q
'^(bgwiki|bgwiktionary|commonswiki|cswiki|dewiki|enwikiquote|enwiktionary|eowiki|fiwiki|idwiki|itwiki|nlwiki|nowiki|plwiki|ptwiki|svwiki|thwiki|trwiki|zhwiki)$';
then
- echo "$line-p 1H IN CNAME sql-s2.toolserver.org."
- elif [ $line = enwiki ]; then
- echo "$line-p 1H IN CNAME sql-s1.toolserver.org."
- else
- echo "$line-p 1H IN CNAME sql-s3.toolserver.org."
- fi;
-done
-) < $DBLIST > $POWERDNSDIR/dblist-cnames
+$SCRIPTDIR/gen-dblist-cnames
# Generate the zonefiles from the templates
echo "Generating zonefiles from zone templates"
Modified: trunk/debs/wikimedia-task-dns-auth/debian/changelog
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/debian/changelog 2009-11-15 16:05:22 UTC
(rev 59103)
+++ trunk/debs/wikimedia-task-dns-auth/debian/changelog 2009-11-15 17:12:58 UTC
(rev 59104)
@@ -1,3 +1,14 @@
+wikimedia-task-dns-auth (0.11) hardy; urgency=low
+
+ * Refactored authdns-update into separate scripts
+ * Removed directory scenarios/yaseo-down
+ * Renamed directory knams-down to esams-down
+ * Changed zwinger into fenari in /etc/default/wikimedia-task-dns-auth
+ * Depend on pnds > 2.9.22
+ * Add script authdns-local-update
+
+ -- Mark Bergsma <m...@wikimedia.org> Sun, 15 Nov 2009 14:55:58 +0000
+
wikimedia-task-dns-auth (0.10) hardy; urgency=low
* Add <language>.m.wikipedia.org entries
Modified: trunk/debs/wikimedia-task-dns-auth/debian/conffiles
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/debian/conffiles 2009-11-15 16:05:22 UTC
(rev 59103)
+++ trunk/debs/wikimedia-task-dns-auth/debian/conffiles 2009-11-15 17:12:58 UTC
(rev 59104)
@@ -2,7 +2,5 @@
/etc/default/wikimedia-task-dns-auth
/etc/powerdns/scenarios/normal/rr.wikimedia.org
/etc/powerdns/scenarios/normal/upload.wikimedia.org
-/etc/powerdns/scenarios/knams-down/rr.wikimedia.org
-/etc/powerdns/scenarios/knams-down/upload.wikimedia.org
-/etc/powerdns/scenarios/yaseo-down/rr.wikimedia.org
-/etc/powerdns/scenarios/yaseo-down/upload.wikimedia.org
+/etc/powerdns/scenarios/esams-down/rr.wikimedia.org
+/etc/powerdns/scenarios/esams-down/upload.wikimedia.org
Modified: trunk/debs/wikimedia-task-dns-auth/debian/control
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/debian/control 2009-11-15 16:05:22 UTC
(rev 59103)
+++ trunk/debs/wikimedia-task-dns-auth/debian/control 2009-11-15 17:12:58 UTC
(rev 59104)
@@ -2,12 +2,12 @@
Section: unknown
Priority: optional
Maintainer: Mark Bergsma <m...@wikimedia.org>
-Build-Depends: debhelper (>= 4.0.0), pdns-server (>= 2.9.21)
+Build-Depends: debhelper (>= 4.0.0), pdns-server (>= 2.9.22)
Standards-Version: 3.6.2
Package: wikimedia-task-dns-auth
Architecture: all
-Depends: pdns-server (>= 2.9.21), pdns-backend-geo (>= 2.9.21),
pdns-backend-pipe (>= 2.9.21), python, rsync
+Depends: pdns-server (>= 2.9.22), pdns-backend-geo (>= 2.9.22),
pdns-backend-pipe (>= 2.9.22), python, rsync
Description: Provides a Wikimedia authoritative DNS server
Package wikimedia-task-dns-auth depends on the appropriate packages
that need to be installed on a Wikimedia authoritative DNS server,
Modified: trunk/debs/wikimedia-task-dns-auth/debian/rules
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/debian/rules 2009-11-15 16:05:22 UTC
(rev 59103)
+++ trunk/debs/wikimedia-task-dns-auth/debian/rules 2009-11-15 17:12:58 UTC
(rev 59104)
@@ -67,15 +67,15 @@
install -m 0644 debian/wikimedia-task-dns-auth-default
$(DESTDIR)/etc/default/wikimedia-task-dns-auth
install gen-zones $(DESTDIR)/usr/lib/wikimedia-task-dns-auth/bin/
install gen-bind.conf $(DESTDIR)/usr/lib/wikimedia-task-dns-auth/bin/
- install authdns-update authdns-scenario $(DESTDIR)/usr/sbin/
+ install gen-langlist-cnames
$(DESTDIR)/usr/lib/wikimedia-task-dns-auth/bin/
+ install gen-dblist-cnames
$(DESTDIR)/usr/lib/wikimedia-task-dns-auth/bin/
+ install authdns-update authdns-local-update authdns-scenario
$(DESTDIR)/usr/sbin/
install -m 0644 -o pdns zz.countries.nerd.dk.rbldnsd
$(DESTDIR)/etc/powerdns/ip-map/
install -d $(DESTDIR)/etc/powerdns/scenarios/
install -d $(DESTDIR)/etc/powerdns/scenarios/normal
- install -d $(DESTDIR)/etc/powerdns/scenarios/knams-down
- install -d $(DESTDIR)/etc/powerdns/scenarios/yaseo-down
+ install -d $(DESTDIR)/etc/powerdns/scenarios/esams-down
install scenarios/normal/* $(DESTDIR)/etc/powerdns/scenarios/normal/
- install scenarios/knams-down/*
$(DESTDIR)/etc/powerdns/scenarios/knams-down/
- install scenarios/yaseo-down/*
$(DESTDIR)/etc/powerdns/scenarios/yaseo-down/
+ install scenarios/esams-down/*
$(DESTDIR)/etc/powerdns/scenarios/esams-down/
# Build architecture-independent files here.
Modified:
trunk/debs/wikimedia-task-dns-auth/debian/wikimedia-task-dns-auth-default
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/debian/wikimedia-task-dns-auth-default
2009-11-15 16:05:22 UTC (rev 59103)
+++ trunk/debs/wikimedia-task-dns-auth/debian/wikimedia-task-dns-auth-default
2009-11-15 17:12:58 UTC (rev 59104)
@@ -4,6 +4,6 @@
NAMESERVERS="ns0.wikimedia.org ns1.wikimedia.org ns2.wikimedia.org"
# Server to rsync "langlist" from:
-LANGLISTSOURCE=zwinger.wikimedia.org:/home/wikipedia/common/langlist
+LANGLISTSOURCE=fenari.wikimedia.org:/home/wikipedia/common/langlist
-DBLISTSOURCE=zwinger.wikimedia.org:/home/wikipedia/common/all.dblist
+DBLISTSOURCE=fenari.wikimedia.org:/home/wikipedia/common/all.dblist
Added: trunk/debs/wikimedia-task-dns-auth/gen-dblist-cnames
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/gen-dblist-cnames
(rev 0)
+++ trunk/debs/wikimedia-task-dns-auth/gen-dblist-cnames 2009-11-15
17:12:58 UTC (rev 59104)
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+POWERDNSDIR=/etc/powerdns
+
+DBLIST=$POWERDNSDIR/all.dblist
+DBLISTSOURCE=""
+
+PATH=/bin:/usr/bin:/usr/local/bin
+
+(
+while read line; do
+ line=`echo $line | tr _ -`
+ if echo $line | egrep -q
'^(bgwiki|bgwiktionary|commonswiki|cswiki|dewiki|enwikiquote|enwiktionary|eowiki|fiwiki|idwiki|itwiki|nlwiki|nowiki|plwiki|ptwiki|svwiki|thwiki|trwiki
+|zhwiki)$'; then
+ echo "$line-p 1H IN CNAME sql-s2.toolserver.org."
+ elif [ $line = enwiki ]; then
+ echo "$line-p 1H IN CNAME sql-s1.toolserver.org."
+ else
+ echo "$line-p 1H IN CNAME sql-s3.toolserver.org."
+ fi;
+done
+) < $DBLIST > $POWERDNSDIR/dblist-cnames
Added: trunk/debs/wikimedia-task-dns-auth/gen-langlist-cnames
===================================================================
--- trunk/debs/wikimedia-task-dns-auth/gen-langlist-cnames
(rev 0)
+++ trunk/debs/wikimedia-task-dns-auth/gen-langlist-cnames 2009-11-15
17:12:58 UTC (rev 59104)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+PATH=/bin:/usr/bin
+
+POWERDNSDIR=/etc/powerdns
+LANGLIST=$POWERDNSDIR/langlist
+LANGLISTSOURCE=""
+
+[ $LANGLIST -nt $POWERDNSDIR/langlist-cnames ] && < $LANGLIST awk '{ print
$1"\t\t\t1H\tIN CNAME\trr.wikimedia.org."; print"www."$1"\t\t\t1H\tIN
CNAME\trr.wikimedia.org."; print $1".m\t\t\t1H\tIN
CNAME\tmobile1.wikimedia.org." }' > $POWERDNSDIR/langlist-cnames
+
Property changes on: trunk/debs/wikimedia-task-dns-auth/gen-langlist-cnames
___________________________________________________________________
Added: svn:executable
+ *
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
