Merge lp:~allenap/maas/bind-in-knots-bug-1066929 into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Remove MAAS-related include lines from named's config before adding new.

[Raphaël Badin (rvb)]

Looks good.

Note that each "cycle" adds a new line but it's the fault of the get_named_conf command.

i.e.: after 3 cycles, the conf file looks like this:

"""
//
// Do any local configuration here
//

// Consider adding the 1918 zones here, if they are not used in your
// organization
//include "/etc/bind/zones.rfc1918";

include "/etc/bind/maas/named.conf.maas";
"""

review: Approve

[Gavin Panella (allenap)]

Ah, interesting. I've tried to address that in:

https://code.launchpad.net/~allenap/maas/no-extra-line-for-bind-bug-1066929/+merge/129893

=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2012-10-11 18:16:28 +0000
+++ debian/maas-dns.postinst	2012-10-16 12:28:24 +0000
@@ -17,12 +17,10 @@
         chmod 600 /etc/bind/maas/rndc.conf.maas
     fi
 
-    # add the required line to "/etc/bind/named.conf.local"
-    if ! grep -qs "^include.*\/etc\/bind\/maas\;$" /etc/bind/maas.conf.local; then
-        include_path=$(maas get_named_conf | grep "include\ [a-z\"\/\.]\+;")
-        sed -i "\$a $include_path" \
-            /etc/bind/named.conf.local
-    fi
+    # remove any existing MAAS-related include line from
+    # /etc/bind/named.conf.local, then re-add it.
+    sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
+    maas get_named_conf --edit --config_path /etc/bind/named.conf.local
 
     if [ -x /usr/sbin/invoke-rc.d ]; then
         invoke-rc.d bind9 restart || true