[28232] in Source-Commits
dns-config commit: Fix postinst; update fallback DNS servers
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed May 28 16:24:28 2014
Date: Wed, 28 May 2014 16:24:21 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201405282024.s4SKOLX6018716@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/dns-config/commit/58b0e68a5a9dd2532f6a18fb9d212f8f6bbf48d9
commit 58b0e68a5a9dd2532f6a18fb9d212f8f6bbf48d9
Author: Jonathan Reed <jdreed@mit.edu>
Date: Fri May 23 16:12:41 2014 -0400
Fix postinst; update fallback DNS servers
- Do not restart dnsmasq in the postinst, because it might have
unpredictable results. If dnsmasq is being installed for the
first time, it will start itself in its postinst. Otherwise,
they obviously have a working config.
- Don't use an absolute path for resolvconf in the postinst,
because Lintian.
- Use Google Public DNS for the fallback DNS servers
debian/changelog | 7 +++++++
debian/control | 1 -
debian/debathena-dns-config.install | 2 +-
debian/debathena-dns-config.postinst | 4 +---
debian/fallback-resolv-conf | 4 ++++
debian/mit-resolv-conf | 3 ---
6 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f5aae7f..375bb0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debathena-dns-config (1.9) unstable; urgency=low
+
+ * Don't restart dnsmasq in the postinst, it might not work (Trac: #1131)
+ * Switch to Google Public DNS for the fallback DNS servers
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 23 May 2014 16:12:34 -0400
+
debathena-dns-config (1.8) unstable; urgency=low
[ Jonathan Reed ]
diff --git a/debian/control b/debian/control
index 76d4c18..ff28735 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Standards-Version: 3.9.3
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
diff --git a/debian/debathena-dns-config.install b/debian/debathena-dns-config.install
index faeecb1..e293d76 100644
--- a/debian/debathena-dns-config.install
+++ b/debian/debathena-dns-config.install
@@ -1,2 +1,2 @@
debian/99debathena etc/dnsmasq.d
-debian/mit-resolv-conf usr/share/debathena-dns-config
+debian/fallback-resolv-conf usr/share/debathena-dns-config
diff --git a/debian/debathena-dns-config.postinst b/debian/debathena-dns-config.postinst
index b27cbc2..7e84fc5 100644
--- a/debian/debathena-dns-config.postinst
+++ b/debian/debathena-dns-config.postinst
@@ -23,15 +23,13 @@ set -e
case "$1" in
configure)
if hash invoke-rc.d 2>/dev/null; then
- invoke-rc.d dnsmasq restart || true
invoke-rc.d debathena-dns-config restart
else
- /etc/init.d/dnsmasq restart || true
/etc/init.d/debathena-dns-config restart
fi
if ! grep -q '^nameserver' /etc/resolv.conf; then
# Don't leave people without a nameserver
- cat /usr/share/debathena-dns-config/mit-resolv-conf | /sbin/resolvconf -a lo.dns-config
+ cat /usr/share/debathena-dns-config/fallback-resolv-conf | resolvconf -a lo.dns-config
fi
if [ -x /usr/share/update-notifier/notify-reboot-required ]; then
/usr/share/update-notifier/notify-reboot-required
diff --git a/debian/fallback-resolv-conf b/debian/fallback-resolv-conf
new file mode 100644
index 0000000..eb17c2a
--- /dev/null
+++ b/debian/fallback-resolv-conf
@@ -0,0 +1,4 @@
+nameserver 8.8.8.8
+nameserver 8.8.4.4
+nameserver 4.2.2.1
+nameserver 4.2.2.2
diff --git a/debian/mit-resolv-conf b/debian/mit-resolv-conf
deleted file mode 100644
index 2fc30bc..0000000
--- a/debian/mit-resolv-conf
+++ /dev/null
@@ -1,3 +0,0 @@
-nameserver 18.70.0.160
-nameserver 18.71.0.151
-nameserver 18.72.0.3
