Merge lp:~andreserl/maas/fix_dns into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

debian/maas-dns.postinst: Ensure permissions are fixed also on upgrade.

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-24 18:05:29 +0000
+++ debian/changelog	2015-04-24 18:37:39 +0000
@@ -4,6 +4,7 @@
     was making systemd crash (LP: #1446699)
   * debian/maas-proxy.maas-proxy.service: Fix proxy to correctly run
     pre-start script.
+  * debian/maas-dns.postinst: Ensure permissions are fixed also on upgrade.
 
  -- Andres Rodriguez <[e-mail]>  Tue, 21 Apr 2015 13:00:49 -0400
 

=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2015-04-22 19:48:01 +0000
+++ debian/maas-dns.postinst	2015-04-24 18:37:39 +0000
@@ -2,13 +2,7 @@
 
 set -e
 
-if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then
-    # If /etc/bind/maas is empty, set_up_dns.
-    if [ ! "$(ls -A /etc/bind/maas)" ]; then
-        maas-region-admin set_up_dns
-    fi
-
-    # Fix permissions.
+fix_dns_permissions(){
     if [ -d /etc/bind/maas ]; then
         chown -R maas:root /etc/bind/maas
     fi
@@ -27,6 +21,17 @@
         chown maas:bind /etc/bind/maas/named.conf.rndc.maas
         chmod 640 /etc/bind/maas/named.conf.rndc.maas
     fi
+}
+
+# This handles installs and re-configuration
+if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then
+    # If /etc/bind/maas is empty, set_up_dns.
+    if [ ! "$(ls -A /etc/bind/maas)" ]; then
+        maas-region-admin set_up_dns
+    fi
+
+    # Fix permissions.
+    fix_dns_permissions
 
     # Remove any existing MAAS-related include line from
     # /etc/bind/named.conf.local, then re-add it.
@@ -46,6 +51,7 @@
         maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options
         invoke-rc.d bind9 restart || true
     fi
+    fix_dns_permissions
 fi
 
 #DEBHELPER#