Merge lp:~julian-edwards/maas/broken-dns-install-bug-1060549 into lp:~maas-maintainers/maas/packaging

[Julian Edwards]

Ensure maas-dns postinst creates the maas user before trying to chown files

[lp:~julian-edwards/maas/broken-dns-install-bug-1060549]

115. By Julian Edwards on 2012-10-03

convert tabs to spaces in the maas-dns.postinst

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-02 18:42:28 +0000
+++ debian/changelog	2012-10-03 01:48:20 +0000
@@ -1,9 +1,10 @@
-maas (0.1+bzr1134+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (0.1+bzr1137+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   * New upstream release.
 
   [ Julian Edwards ]
   * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
+  * Ensure maas-dns creates the maas user before trying to chown files.
 
   [ Raphaël Badin ]
   * Split celery config into cluster and region configs.
@@ -25,7 +26,7 @@
   * debian/control: Depends on python-netifaces.
   * debian/maas-region-controller: Install maas-import-squashfs
 
- -- Andres Rodriguez <[e-mail]>  Tue, 02 Oct 2012 13:39:47 -0400
+ -- Julian Edwards <[e-mail]>  Wed, 03 Oct 2012 11:26:05 +1000
 
 maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2012-08-31 18:04:22 +0000
+++ debian/maas-dns.postinst	2012-10-03 01:48:20 +0000
@@ -1,32 +1,49 @@
 #!/bin/sh -e
 
+add_user_group(){
+    local user="maas"
+    local group="maas"
+    if ! getent group "$group" >/dev/null; then
+        addgroup --quiet --system "$group" || true
+    fi
+    if ! getent passwd "$user" > /dev/null 2>&1; then
+        adduser --quiet \
+                    --system \
+                    --group \
+                    --no-create-home \
+                    "$user" || true
+    fi
+}
+
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
-	# If /etc/bind/maas is empty, set_up_dns.
-	if [ ! "$(ls -A /etc/bind/maas)" ]; then
-		maas set_up_dns
-	fi
-
-	# fix permissions
-	if [ -d /etc/bind/maas ]; then
-		chown -R maas:root /etc/bind/maas
-	fi
-	if [ -f /etc/bind/maas/named.conf.maas ]; then
-		chmod 644 /etc/bind/maas/named.conf.maas
-	fi
-	if [ -f /etc/bind/maas/rndc.conf.maas ]; then
-		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
-
-	if [ -x /usr/sbin/invoke-rc.d ]; then
-		invoke-rc.d bind9 restart || true
-	fi
+    add_user_group
+
+    # If /etc/bind/maas is empty, set_up_dns.
+    if [ ! "$(ls -A /etc/bind/maas)" ]; then
+        maas set_up_dns
+    fi
+
+    # fix permissions
+    if [ -d /etc/bind/maas ]; then
+        chown -R maas:root /etc/bind/maas
+    fi
+    if [ -f /etc/bind/maas/named.conf.maas ]; then
+        chmod 644 /etc/bind/maas/named.conf.maas
+    fi
+    if [ -f /etc/bind/maas/rndc.conf.maas ]; then
+        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
+
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+        invoke-rc.d bind9 restart || true
+    fi
 fi
 
 #DEBHELPER#