Merge lp:~ubuntudotcom1/maas/bug-1446840-packaging-named.conf.options.inside.maas-perms into lp:~maas-maintainers/maas/packaging

[ubuntudotcom1]

Fix for bug 1446840 /etc/bind/maas/named.conf.options.inside.maas and /etc/bind/maas/named.conf.options.maas by making explicit maas:maas ownership of these files.

Fix for bug 1446840 /etc/bind/maas/named.conf.options.inside.maas and /etc/bind/maas/named.conf.options.maas by making explicit maas:maas ownership of these files.

[Ricardo Bánffy (rbanffy)]

review: Approve

[Blake Rouse (blake-rouse)]

I did this manually on trusty and it fixed my internal server error. We should land this in packaging ASAP.

review: Approve

=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2014-03-28 15:44:39 +0000
+++ debian/maas-dns.postinst	2015-04-22 19:53:20 +0000
@@ -13,8 +13,13 @@
         chown -R maas:root /etc/bind/maas
     fi
     if [ -f /etc/bind/maas/named.conf.maas ]; then
+        chown maas:maas /etc/bind/maas/named.conf.maas
         chmod 644 /etc/bind/maas/named.conf.maas
     fi
+    if [ -f /etc/bind/maas/named.conf.options.inside.maas ]; then
+        chown maas:maas /etc/bind/maas/named.conf.options.inside.maas
+        chmod 644 /etc/bind/maas/named.conf.options.inside.maas
+    fi
     if [ -f /etc/bind/maas/rndc.conf.maas ]; then
         chmod 600 /etc/bind/maas/rndc.conf.maas
     fi