| Index: trunk/debs/wikimedia-task-dns-auth/debian/control |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | |
| 9 | 9 | Package: wikimedia-task-dns-auth |
| 10 | 10 | Architecture: all |
| 11 | | -Depends: pdns-server, pdns-backend-geo, python, rsync |
| | 11 | +Depends: pdns-server (>= 2.9.21), pdns-backend-geo (>= 2.9.21), python, rsync |
| 12 | 12 | Description: Provides a Wikimedia authoritative DNS server |
| 13 | 13 | Package wikimedia-task-dns-auth depends on the appropriate packages |
| 14 | 14 | that need to be installed on a Wikimedia authoritative DNS server, |
| Index: trunk/debs/wikimedia-task-dns-auth/debian/cron.d |
| — | — | @@ -1,2 +1 @@ |
| 2 | | -07 04 * * * pdns rsync -qt rsync://countries-ns.mdc.dk/zone/zz.countries.nerd.dk.rbldnsd \ |
| 3 | | - /etc/powerdns/zz.countries.nerd.dk.rbldnsd && pdns_control rediscover > /dev/null |
| | 2 | +7 4 * * * pdns rsync -qt "rsync://countries-ns.mdc.dk/zone/zz.countries.nerd.dk.rbldnsd'" /etc/powerdns/ip-map/zz.countries.nerd.dk.rbldnsd && pdns_control rediscover > /dev/null |
| Index: trunk/debs/wikimedia-task-dns-auth/debian/postrm |
| — | — | @@ -17,14 +17,13 @@ |
| 18 | 18 | # for details, see http://www.debian.org/doc/debian-policy/ or |
| 19 | 19 | # the debian-policy package |
| 20 | 20 | |
| 21 | | - |
| 22 | 21 | case "$1" in |
| 23 | 22 | purge) |
| 24 | 23 | dpkg-divert --package wikimedia-task-dns-auth --remove --rename \ |
| 25 | 24 | --divert /etc/powerdns/pdns.conf.default /etc/powerdns/pdns.conf |
| 26 | | - |
| 27 | | - rm -f /etc/powerdns/{bind.conf,langlist,langlist-cnames} |
| 28 | | - rm -rf /etc/powerdns/{templates,zones,scenarios,geomaps} |
| | 25 | + rm -f /etc/powerdns/geomaps |
| | 26 | + rm -rf /etc/powerdns/scenarios |
| | 27 | + rm -rf /etc/powerdns/ip-map |
| 29 | 28 | ;; |
| 30 | 29 | remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) |
| 31 | 30 | |
| Index: trunk/debs/wikimedia-task-dns-auth/debian/prerm |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | |
| 21 | 21 | case "$1" in |
| 22 | 22 | remove|deconfigure) |
| 23 | | - # Add a line to /etc/motd describing the task of this server |
| | 23 | + # Remove the line to /etc/motd describing the task of this server |
| 24 | 24 | if [ -f /etc/motd.tail ] |
| 25 | 25 | then |
| 26 | 26 | MOTDFILE=/etc/motd.tail |
| Index: trunk/debs/wikimedia-task-dns-auth/debian/changelog |
| — | — | @@ -1,3 +1,13 @@ |
| | 2 | +wikimedia-task-dns-auth (0.05) feisty; urgency=medium |
| | 3 | + |
| | 4 | + * Depend on pdns >= 2.9.21 |
| | 5 | + * Update the configuration file to use the bind(2) backend |
| | 6 | + * Move the countries file to a subdir owned by user pdns, |
| | 7 | + so the nonprivileged cron job can update the zone file |
| | 8 | + * Make the postrm script work with dash |
| | 9 | + |
| | 10 | + -- Mark Bergsma <mark@mint.knams.wikimedia.org> Sun, 24 Jun 2007 15:10:36 +0000 |
| | 11 | + |
| 2 | 12 | wikimedia-task-dns-auth (0.04) edgy; urgency=medium |
| 3 | 13 | |
| 4 | 14 | * Fix bug in authdns-update where the /etc/powerdns/geomaps sanity check |
| Index: trunk/debs/wikimedia-task-dns-auth/debian/rules |
| — | — | @@ -58,6 +58,7 @@ |
| 59 | 59 | #$(MAKE) install DESTDIR=$(CURDIR)/debian/wikimedia-task-dns-auth |
| 60 | 60 | install -d $(DESTDIR)/etc/powerdns $(DESTDIR)/etc/powerdns/templates \ |
| 61 | 61 | $(DESTDIR)/etc/powerdns/zones |
| | 62 | + install -d -o pdns $(DESTDIR)/etc/powerdns/ip-map |
| 62 | 63 | install -d $(DESTDIR)/etc/default |
| 63 | 64 | install -d $(DESTDIR)/usr/lib/wikimedia-task-dns-auth/bin |
| 64 | 65 | install -d $(DESTDIR)/usr/sbin |
| — | — | @@ -67,7 +68,7 @@ |
| 68 | 69 | install gen-zones $(DESTDIR)/usr/lib/wikimedia-task-dns-auth/bin/ |
| 69 | 70 | install gen-bind.conf $(DESTDIR)/usr/lib/wikimedia-task-dns-auth/bin/ |
| 70 | 71 | install authdns-update authdns-scenario $(DESTDIR)/usr/sbin/ |
| 71 | | - install -m 0644 zz.countries.nerd.dk.rbldnsd $(DESTDIR)/etc/powerdns/ |
| | 72 | + install -m 0644 -o pdns zz.countries.nerd.dk.rbldnsd $(DESTDIR)/etc/powerdns/ip-map/ |
| 72 | 73 | install -d $(DESTDIR)/etc/powerdns/scenarios/ |
| 73 | 74 | install -d $(DESTDIR)/etc/powerdns/scenarios/normal |
| 74 | 75 | install -d $(DESTDIR)/etc/powerdns/scenarios/knams-down |
| Index: trunk/debs/wikimedia-task-dns-auth/pdns.conf |
| — | — | @@ -37,16 +37,16 @@ |
| 38 | 38 | log-dns-details=no |
| 39 | 39 | |
| 40 | 40 | # Backends to load |
| 41 | | -launch=bind1,geo |
| | 41 | +launch=bind,geo |
| 42 | 42 | |
| 43 | 43 | # Bind backend configuration |
| 44 | | -bind1-config=/etc/powerdns/bind.conf |
| | 44 | +bind-config=/etc/powerdns/bind.conf |
| 45 | 45 | |
| 46 | 46 | # Geobackend configuration |
| 47 | 47 | geo-zone=wikimedia.org |
| 48 | 48 | geo-soa-values=ns0.wikimedia.org,hostmaster@wikimedia.org |
| 49 | 49 | geo-ns-records=ns0.wikimedia.org,ns1.wikimedia.org,ns2.wikimedia.org |
| 50 | | -geo-ip-map-zonefile=/etc/powerdns/zz.countries.nerd.dk.rbldnsd |
| | 50 | +geo-ip-map-zonefile=/etc/powerdns/ip-map/zz.countries.nerd.dk.rbldnsd |
| 51 | 51 | geo-maps=/etc/powerdns/geomaps/ |
| 52 | 52 | geo-ttl=600 |
| 53 | 53 | geo-ns-ttl=600 |