Merge lp:~andreserl/maas/packaging_maas_user_1.7 into lp:~maas-maintainers/maas/packaging.utopic

[Andres Rodriguez]

* Set 'maas' homedir to '/var/lib/maas' (LP: #1399016):
  - debian/maas-common.postinst: Do not try to update 'maas'
    home user dir on upgrade.
  - 03-set-maas-home-dir-lp1399016.patch: Ensure that wsgi config
    sets the correct path.

[lp:~andreserl/maas/packaging_maas_user_1.7]

345. By Andres Rodriguez on 2014-12-05

Remove patch as this has been merged with upstream

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-03 19:30:01 +0000
+++ debian/changelog	2014-12-05 16:01:25 +0000
@@ -6,6 +6,11 @@
   * debian/maas-cluster-controller.postinst: configure MAAS_URL through new
     "maas-provision configure-maas-url" sub-command instead of with "sed".
 
+  [ Andres Rodriguez ]
+  * Set 'maas' homedir to '/var/lib/maas' (LP: #1399016):
+    - debian/maas-common.postinst: Do not try to update 'maas'
+      home user dir on upgrade.
+
  -- Andres Rodriguez <[e-mail]>  Fri, 14 Nov 2014 09:04:29 -0500
 
 maas (1.7.0+bzr3299-0ubuntu1) utopic; urgency=medium

=== modified file 'debian/maas-common.postinst'
--- debian/maas-common.postinst	2014-07-29 14:04:02 +0000
+++ debian/maas-common.postinst	2014-12-05 16:01:25 +0000
@@ -5,8 +5,9 @@
 add_user_group(){
 	local user="maas"
 	local group="maas"
+	local home="/var/lib/maas"
 	addgroup --quiet --system "$group" || true
-	adduser --quiet --system --group --no-create-home "$user" || true
+	adduser --quiet --system --group --home "$home" "$user" || true
 }
 
 ln -sf /usr/share/maas/maas-rsyslog.conf /etc/rsyslog.d/99-maas.conf