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

Proposed by Andres Rodriguez on 2014-12-04
Status: Merged
Approved by: Andres Rodriguez on 2014-12-05
Approved revision: 335
Merged at revision: 334
Proposed branch: lp:~andreserl/maas/packaging_maas_user_1.8
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 34 lines (+8/-2)
2 files modified
debian/changelog (+6/-1)
debian/maas-common.postinst (+2/-1)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_maas_user_1.8
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2014-12-05
Review via email: mp+243725@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.
Raphaël Badin (rvb) wrote :

1.8 hasn't been released yet so shouldn't we fix contrib/maas-http.conf in the upstream code instead of doing it in the packaging (debian/patches/03-set-maas-home-dir-lp1399016.patch)?

335. By Andres Rodriguez on 2014-12-05

Drop patch to fix wsgi as this was merged upstream

Andres Rodriguez (andreserl) wrote :

self approve!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-11-14 14:05:53 +0000
3+++ debian/changelog 2014-12-05 15:22:12 +0000
4@@ -1,9 +1,14 @@
5-maas (1.7.1+bzr3373-0ubuntu1) UNRELEASED; urgency=medium
6+maas (1.8.0~beta1+bzr3398-0ubuntu1) UNRELEASED; urgency=medium
7
8 [ Jeroen Vermeulen ]
9 * debian/maas-cluster-controller.postinst: configure MAAS_URL through new
10 "maas-provision configure-maas-url" sub-command instead of with "sed".
11
12+ [ Andres Rodriguez ]
13+ * Set 'maas' homedir to '/var/lib/maas' (LP: #1399016):
14+ - debian/maas-common.postinst: Do not try to update 'maas'
15+ home user dir on upgrade.
16+
17 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 14 Nov 2014 09:04:29 -0500
18
19 maas (1.7.0+bzr3299-0ubuntu1) utopic; urgency=medium
20
21=== modified file 'debian/maas-common.postinst'
22--- debian/maas-common.postinst 2014-07-29 14:04:02 +0000
23+++ debian/maas-common.postinst 2014-12-05 15:22:12 +0000
24@@ -5,8 +5,9 @@
25 add_user_group(){
26 local user="maas"
27 local group="maas"
28+ local home="/var/lib/maas"
29 addgroup --quiet --system "$group" || true
30- adduser --quiet --system --group --no-create-home "$user" || true
31+ adduser --quiet --system --group --home "$home" "$user" || true
32 }
33
34 ln -sf /usr/share/maas/maas-rsyslog.conf /etc/rsyslog.d/99-maas.conf

Subscribers

People subscribed via source and target branches

to all changes: