Merge lp:~louis/maas/lp1346703_rsyslog_ownership into lp:~maas-maintainers/maas/packaging

Proposed by Louis Bouchard
Status: Merged
Approved by: Gavin Panella
Approved revision: 304
Merged at revision: 303
Proposed branch: lp:~louis/maas/lp1346703_rsyslog_ownership
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 29 lines (+10/-1)
2 files modified
debian/changelog (+9/-0)
debian/maas-cluster-controller.postinst (+1/-1)
To merge this branch: bzr merge lp:~louis/maas/lp1346703_rsyslog_ownership
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+234080@code.launchpad.net

Commit message

During installation, don't make the ‘maas’ user owner of log files that are owned by syslog; it stops syslog from writing to them.

Description of the change

maas-region-controller.postinst sets the ownership of the /var/log/maas/rsyslog directory to syslog:syslog so the syslog daemon can write to it.

When maas-cluster-controller.postinst runs after installation of maas-region-controller, it changes the ownership of /var/log/maas/rsyslog to maas:maas. The syslog daemon can no longer write to it.

This proposed fix keeps the /var/log/maas/rsyslog ownership intact

To post a comment you must log in.
303. By Louis Bouchard

During installation, don't make the ‘maas’ user owner of log files that are owned by syslog; it stops syslog from writing to them.

Revision history for this message
Gavin Panella (allenap) wrote :

Tip top.

review: Approve
304. By Louis Bouchard

Change cmd syntax according to Merge Proposal comment

Revision history for this message
Andres Rodriguez (andreserl) wrote :

The changelong entry should have been done on UNRELEASED rather than a completely new changelog entry.

Revision history for this message
Gavin Panella (allenap) wrote :

Sorry Andres, I didn't realise when reviewing. Next time I'll add you as a reviewer before landing.

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-09-10 07:54:58 +0000
3+++ debian/changelog 2014-09-10 14:08:31 +0000
4@@ -1,3 +1,12 @@
5+maas (1.7.0~beta1+bzr2781-0ubuntu2) utopic; urgency=medium
6+
7+ [Louis Bouchard]
8+ * debian/maas-cluster-controller.postinst:
9+ - Exclude /var/log/maas/rsyslog when changing ownership
10+ (LP: #1346703)
11+
12+ -- Louis Bouchard <louis.bouchard@canonical.com> Tue, 09 Sep 2014 15:53:05 +0200
13+
14 maas (1.7.0~beta1+bzr2783-0ubuntu2) UNRELEASED; urgency=medium
15
16 * UNRELEASED
17
18=== modified file 'debian/maas-cluster-controller.postinst'
19--- debian/maas-cluster-controller.postinst 2014-07-29 10:51:48 +0000
20+++ debian/maas-cluster-controller.postinst 2014-09-10 14:08:31 +0000
21@@ -22,7 +22,7 @@
22
23 # Give appropriate permissions
24 chown -R maas:maas /var/lib/maas/
25- chown -R maas:maas /var/log/maas
26+ find /var/log/maas -not -user syslog -print0 | xargs -r0 chown maas:maas
27 chmod -R 775 /var/log/maas/oops
28 chown syslog:syslog /var/log/maas/maas.log
29 }

Subscribers

People subscribed via source and target branches