MAAS

Merge lp:~julian-edwards/maas/packaging-syslog into lp:~maas-maintainers/maas/packaging

  1. packaging-syslog
  2. Merge into packaging
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: 289
Merged at revision: 288
Proposed branch: lp:~julian-edwards/maas/packaging-syslog
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 114 lines (+32/-3)
7 files modified
debian/changelog (+8/-3)
debian/maas-cluster-controller.postinst (+6/-0)
debian/maas-common.install (+1/-0)
debian/maas-common.postinst (+2/-0)
debian/maas-common.postrm (+3/-0)
debian/maas-region-controller-min.postinst (+6/-0)
debian/maas-region-controller.postinst (+6/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging-syslog
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+228647@code.launchpad.net

Commit message

Install /var/log/maas/maas.log as the maas syslog file.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
lp:~julian-edwards/maas/packaging-syslog updated
288. By Julian Edwards

Use manual symlinks to install 99-maas.conf

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

lgtm! Lines between 106 / 111 indentation looks funny though.

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

OH GOD. The rest of the file is using tabs.

Kill me.

lp:~julian-edwards/maas/packaging-syslog updated
289. By Julian Edwards

convert space indents to use tabs like the rest of the file. SIGH.

Revision history for this message
Andres Rodriguez (andreserl) :
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-07-29 08:55:21 +0000
3+++ debian/changelog 2014-07-29 11:16:10 +0000
4@@ -1,4 +1,4 @@
5-maas (1.6+bzr2367-0ubuntu2) UNRELEASED; urgency=medium
6+maas (1.6+bzr2367-0ubuntu3) UNRELEASED; urgency=medium
7
8 * UNRELEASED
9
10@@ -35,9 +35,14 @@
11 debian/maas-region-controller-min.logrotate
12 debian/maas-region-controller-min.postinst
13 debian/maas-region-controller.postinst
14- - Change the log file name maas.log tro maas-django.log
15+ - Change the log file name maas.log to maas-django.log
16+ * debian/maas-cluster-controller.postinst
17+ debian/maas-common.install
18+ debian/maas-region-controller-min.postinst
19+ debian/maas-region-controller.postinst
20+ - Install /var/log/maas/maas.log as a syslog file.
21
22- -- Julian Edwards <julian.edwards@canonical.com> Tue, 29 Jul 2014 09:52:59 +0100
23+ -- Julian Edwards <julian.edwards@canonical.com> Tue, 29 Jul 2014 11:49:39 +0100
24
25 maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium
26
27
28=== modified file 'debian/maas-cluster-controller.postinst'
29--- debian/maas-cluster-controller.postinst 2014-06-27 18:35:19 +0000
30+++ debian/maas-cluster-controller.postinst 2014-07-29 11:16:10 +0000
31@@ -15,10 +15,16 @@
32 if [ ! -d /var/log/maas/oops ]; then
33 mkdir -p /var/log/maas/oops
34 fi
35+ # Main syslog file.
36+ if [ ! -f /var/log/maas/maas.log ]; then
37+ touch /var/log/maas/maas.log
38+ fi
39+
40 # Give appropriate permissions
41 chown -R maas:maas /var/lib/maas/
42 chown -R maas:maas /var/log/maas
43 chmod -R 775 /var/log/maas/oops
44+ chown syslog:syslog /var/log/maas/maas.log
45 }
46
47 configure_maas_tgt() {
48
49=== modified file 'debian/maas-common.install'
50--- debian/maas-common.install 2012-09-29 17:21:10 +0000
51+++ debian/maas-common.install 2014-07-29 11:16:10 +0000
52@@ -1,2 +1,3 @@
53 # Install Celery Config
54 debian/tmp/usr/share/maas/celeryconfig_common.py
55+debian/tmp/usr/share/maas/maas-rsyslog.conf
56
57=== modified file 'debian/maas-common.postinst'
58--- debian/maas-common.postinst 2014-04-25 01:23:06 +0000
59+++ debian/maas-common.postinst 2014-07-29 11:16:10 +0000
60@@ -9,6 +9,8 @@
61 adduser --quiet --system --group --no-create-home "$user" || true
62 }
63
64+ln -sf /usr/share/maas/maas-rsyslog.conf /etc/rsyslog/99-maas.conf
65+
66 add_user_group
67
68 #DEBHELPER#
69
70=== modified file 'debian/maas-common.postrm'
71--- debian/maas-common.postrm 2013-03-20 16:44:30 +0000
72+++ debian/maas-common.postrm 2014-07-29 11:16:10 +0000
73@@ -11,4 +11,7 @@
74 fi
75 esac
76
77+rm -f /etc/rsyslog/99-maas.conf
78+
79+
80 #DEBHELPER#
81
82=== modified file 'debian/maas-region-controller-min.postinst'
83--- debian/maas-region-controller-min.postinst 2014-07-29 08:46:49 +0000
84+++ debian/maas-region-controller-min.postinst 2014-07-29 11:16:10 +0000
85@@ -126,6 +126,12 @@
86 chown -R maas:maas /var/log/maas
87 chmod -R 775 /var/log/maas/oops
88
89+ # Main syslog file.
90+ if [ ! -f /var/log/maas/maas.log ]; then
91+ touch /var/log/maas/maas.log
92+ fi
93+ chown syslog:syslog /var/log/maas/maas.log
94+
95 # Create log directory base
96 mkdir -p /var/log/maas/rsyslog
97 chown -R syslog:syslog /var/log/maas/rsyslog
98
99=== modified file 'debian/maas-region-controller.postinst'
100--- debian/maas-region-controller.postinst 2014-07-29 08:46:49 +0000
101+++ debian/maas-region-controller.postinst 2014-07-29 11:16:10 +0000
102@@ -195,6 +195,12 @@
103 chown -R maas:maas /var/log/maas
104 chmod -R 775 /var/log/maas/oops
105
106+ # Main syslog file.
107+ if [ ! -f /var/log/maas/maas.log ]; then
108+ touch /var/log/maas/maas.log
109+ fi
110+ chown syslog:syslog /var/log/maas/maas.log
111+
112 # Create log directory base
113 mkdir -p /var/log/maas/rsyslog
114 chown -R syslog:syslog /var/log/maas/rsyslog

Subscribers

People subscribed via source and target branches