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

Proposed by Andres Rodriguez on 2014-12-04
Status: Merged
Approved by: Andres Rodriguez on 2014-12-05
Approved revision: 345
Merged at revision: 344
Proposed branch: lp:~andreserl/maas/packaging_maas_user_1.7
Merge into: lp:~maas-maintainers/maas/packaging.utopic
Diff against target: 30 lines (+7/-1)
2 files modified
debian/changelog (+5/-0)
debian/maas-common.postinst (+2/-1)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_maas_user_1.7
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2014-12-05
Review via email: mp+243726@code.launchpad.net

Commit message

* 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.

To post a comment you must log in.
345. By Andres Rodriguez on 2014-12-05

Remove patch as this has been merged with upstream

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
6 * debian/maas-cluster-controller.postinst: configure MAAS_URL through new6 * debian/maas-cluster-controller.postinst: configure MAAS_URL through new
7 "maas-provision configure-maas-url" sub-command instead of with "sed".7 "maas-provision configure-maas-url" sub-command instead of with "sed".
88
9 [ Andres Rodriguez ]
10 * Set 'maas' homedir to '/var/lib/maas' (LP: #1399016):
11 - debian/maas-common.postinst: Do not try to update 'maas'
12 home user dir on upgrade.
13
9 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 14 Nov 2014 09:04:29 -050014 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 14 Nov 2014 09:04:29 -0500
1015
11maas (1.7.0+bzr3299-0ubuntu1) utopic; urgency=medium16maas (1.7.0+bzr3299-0ubuntu1) utopic; urgency=medium
1217
=== 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 @@
5add_user_group(){5add_user_group(){
6 local user="maas"6 local user="maas"
7 local group="maas"7 local group="maas"
8 local home="/var/lib/maas"
8 addgroup --quiet --system "$group" || true9 addgroup --quiet --system "$group" || true
9 adduser --quiet --system --group --no-create-home "$user" || true10 adduser --quiet --system --group --home "$home" "$user" || true
10}11}
1112
12ln -sf /usr/share/maas/maas-rsyslog.conf /etc/rsyslog.d/99-maas.conf13ln -sf /usr/share/maas/maas-rsyslog.conf /etc/rsyslog.d/99-maas.conf

Subscribers

People subscribed via source and target branches

to all changes: