[26744] in Source-Commits
/svn/athena r25723 - trunk/debathena/config/dns-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Aug 14 18:31:18 2012
Date: Tue, 14 Aug 2012 18:31:16 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208142231.q7EMVGcj031202@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-14 18:31:16 -0400 (Tue, 14 Aug 2012)
New Revision: 25723
Added:
trunk/debathena/config/dns-config/debian/mit-resolv-conf
Modified:
trunk/debathena/config/dns-config/debian/changelog
trunk/debathena/config/dns-config/debian/control.in
trunk/debathena/config/dns-config/debian/debathena-dns-config.install
trunk/debathena/config/dns-config/debian/debathena-dns-config.postinst
Log:
In dns-config:
* Do not build for Hardy anymore
* Ship a sample resolv.conf for MIT, and use it if we end up with no
nameservers configured at the end of the postinst
Modified: trunk/debathena/config/dns-config/debian/changelog
===================================================================
--- trunk/debathena/config/dns-config/debian/changelog 2012-08-14 22:09:22 UTC (rev 25722)
+++ trunk/debathena/config/dns-config/debian/changelog 2012-08-14 22:31:16 UTC (rev 25723)
@@ -7,8 +7,11 @@
* Bump Standards-Version
* Make initscript LSB-compliant
* Conflict bind9
+ * Do not build for Hardy anymore
+ * Ship a sample resolv.conf for MIT, and use it if we end up with no
+ nameservers configured at the end of the postinst
- -- Jonathan Reed <jdreed@mit.edu> Tue, 14 Aug 2012 12:51:04 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 14 Aug 2012 18:31:08 -0400
debathena-dns-config (1.6) unstable; urgency=low
Modified: trunk/debathena/config/dns-config/debian/control.in
===================================================================
--- trunk/debathena/config/dns-config/debian/control.in 2012-08-14 22:09:22 UTC (rev 25722)
+++ trunk/debathena/config/dns-config/debian/control.in 2012-08-14 22:31:16 UTC (rev 25723)
@@ -7,6 +7,7 @@
Package: debathena-dns-config
Architecture: all
+X-Debathena-No-Build: hardy
Depends: dnsmasq, resolvconf, ${misc:Depends}
Conflicts: bind9
Description: Sets up a local caching nameserver using dnsmasq
Modified: trunk/debathena/config/dns-config/debian/debathena-dns-config.install
===================================================================
--- trunk/debathena/config/dns-config/debian/debathena-dns-config.install 2012-08-14 22:09:22 UTC (rev 25722)
+++ trunk/debathena/config/dns-config/debian/debathena-dns-config.install 2012-08-14 22:31:16 UTC (rev 25723)
@@ -1 +1,2 @@
debian/99debathena etc/dnsmasq.d
+debian/mit-resolv-conf usr/share/debathena-dns-config
Modified: trunk/debathena/config/dns-config/debian/debathena-dns-config.postinst
===================================================================
--- trunk/debathena/config/dns-config/debian/debathena-dns-config.postinst 2012-08-14 22:09:22 UTC (rev 25722)
+++ trunk/debathena/config/dns-config/debian/debathena-dns-config.postinst 2012-08-14 22:31:16 UTC (rev 25723)
@@ -31,7 +31,7 @@
fi
if ! grep -q '^nameserver' /etc/resolv.conf; then
# Don't leave people without a nameserver
- /bin/echo -e "nameserver 18.70.0.160\nnameserver 18.71.0.151" | /sbin/resolvconf -a lo.dns-config
+ cat /usr/share/debathena-dns-config/mit-resolv-conf | /sbin/resolvconf -a lo.dns-config
fi
if [ -x /usr/share/update-notifier/notify-reboot-required ]; then
/usr/share/update-notifier/notify-reboot-required
Added: trunk/debathena/config/dns-config/debian/mit-resolv-conf
===================================================================
--- trunk/debathena/config/dns-config/debian/mit-resolv-conf (rev 0)
+++ trunk/debathena/config/dns-config/debian/mit-resolv-conf 2012-08-14 22:31:16 UTC (rev 25723)
@@ -0,0 +1,3 @@
+nameserver 18.70.0.160
+nameserver 18.71.0.151
+nameserver 18.72.0.3
