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
=== modified file 'debian/changelog'
--- debian/changelog 2014-07-29 08:55:21 +0000
+++ debian/changelog 2014-07-29 11:16:10 +0000
@@ -1,4 +1,4 @@
1maas (1.6+bzr2367-0ubuntu2) UNRELEASED; urgency=medium1maas (1.6+bzr2367-0ubuntu3) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * UNRELEASED
44
@@ -35,9 +35,14 @@
35 debian/maas-region-controller-min.logrotate35 debian/maas-region-controller-min.logrotate
36 debian/maas-region-controller-min.postinst36 debian/maas-region-controller-min.postinst
37 debian/maas-region-controller.postinst37 debian/maas-region-controller.postinst
38 - Change the log file name maas.log tro maas-django.log38 - Change the log file name maas.log to maas-django.log
39 * debian/maas-cluster-controller.postinst
40 debian/maas-common.install
41 debian/maas-region-controller-min.postinst
42 debian/maas-region-controller.postinst
43 - Install /var/log/maas/maas.log as a syslog file.
3944
40 -- Julian Edwards <julian.edwards@canonical.com> Tue, 29 Jul 2014 09:52:59 +010045 -- Julian Edwards <julian.edwards@canonical.com> Tue, 29 Jul 2014 11:49:39 +0100
4146
42maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium47maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium
4348
4449
=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst 2014-06-27 18:35:19 +0000
+++ debian/maas-cluster-controller.postinst 2014-07-29 11:16:10 +0000
@@ -15,10 +15,16 @@
15 if [ ! -d /var/log/maas/oops ]; then15 if [ ! -d /var/log/maas/oops ]; then
16 mkdir -p /var/log/maas/oops16 mkdir -p /var/log/maas/oops
17 fi17 fi
18 # Main syslog file.
19 if [ ! -f /var/log/maas/maas.log ]; then
20 touch /var/log/maas/maas.log
21 fi
22
18 # Give appropriate permissions23 # Give appropriate permissions
19 chown -R maas:maas /var/lib/maas/24 chown -R maas:maas /var/lib/maas/
20 chown -R maas:maas /var/log/maas25 chown -R maas:maas /var/log/maas
21 chmod -R 775 /var/log/maas/oops26 chmod -R 775 /var/log/maas/oops
27 chown syslog:syslog /var/log/maas/maas.log
22}28}
2329
24configure_maas_tgt() {30configure_maas_tgt() {
2531
=== modified file 'debian/maas-common.install'
--- debian/maas-common.install 2012-09-29 17:21:10 +0000
+++ debian/maas-common.install 2014-07-29 11:16:10 +0000
@@ -1,2 +1,3 @@
1# Install Celery Config1# Install Celery Config
2debian/tmp/usr/share/maas/celeryconfig_common.py2debian/tmp/usr/share/maas/celeryconfig_common.py
3debian/tmp/usr/share/maas/maas-rsyslog.conf
34
=== modified file 'debian/maas-common.postinst'
--- debian/maas-common.postinst 2014-04-25 01:23:06 +0000
+++ debian/maas-common.postinst 2014-07-29 11:16:10 +0000
@@ -9,6 +9,8 @@
9 adduser --quiet --system --group --no-create-home "$user" || true9 adduser --quiet --system --group --no-create-home "$user" || true
10}10}
1111
12ln -sf /usr/share/maas/maas-rsyslog.conf /etc/rsyslog/99-maas.conf
13
12add_user_group14add_user_group
1315
14#DEBHELPER#16#DEBHELPER#
1517
=== modified file 'debian/maas-common.postrm'
--- debian/maas-common.postrm 2013-03-20 16:44:30 +0000
+++ debian/maas-common.postrm 2014-07-29 11:16:10 +0000
@@ -11,4 +11,7 @@
11 fi11 fi
12esac12esac
1313
14rm -f /etc/rsyslog/99-maas.conf
15
16
14#DEBHELPER#17#DEBHELPER#
1518
=== modified file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst 2014-07-29 08:46:49 +0000
+++ debian/maas-region-controller-min.postinst 2014-07-29 11:16:10 +0000
@@ -126,6 +126,12 @@
126 chown -R maas:maas /var/log/maas126 chown -R maas:maas /var/log/maas
127 chmod -R 775 /var/log/maas/oops127 chmod -R 775 /var/log/maas/oops
128128
129 # Main syslog file.
130 if [ ! -f /var/log/maas/maas.log ]; then
131 touch /var/log/maas/maas.log
132 fi
133 chown syslog:syslog /var/log/maas/maas.log
134
129 # Create log directory base135 # Create log directory base
130 mkdir -p /var/log/maas/rsyslog136 mkdir -p /var/log/maas/rsyslog
131 chown -R syslog:syslog /var/log/maas/rsyslog137 chown -R syslog:syslog /var/log/maas/rsyslog
132138
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst 2014-07-29 08:46:49 +0000
+++ debian/maas-region-controller.postinst 2014-07-29 11:16:10 +0000
@@ -195,6 +195,12 @@
195 chown -R maas:maas /var/log/maas195 chown -R maas:maas /var/log/maas
196 chmod -R 775 /var/log/maas/oops196 chmod -R 775 /var/log/maas/oops
197197
198 # Main syslog file.
199 if [ ! -f /var/log/maas/maas.log ]; then
200 touch /var/log/maas/maas.log
201 fi
202 chown syslog:syslog /var/log/maas/maas.log
203
198 # Create log directory base204 # Create log directory base
199 mkdir -p /var/log/maas/rsyslog205 mkdir -p /var/log/maas/rsyslog
200 chown -R syslog:syslog /var/log/maas/rsyslog206 chown -R syslog:syslog /var/log/maas/rsyslog

Subscribers

People subscribed via source and target branches