Merge lp:~andreserl/maas/lp1575337 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Make sure that filter only applies to the last rule and doens't prevent from logging everything to syslog

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-26 19:37:38 +0000
+++ debian/changelog	2016-04-26 23:18:33 +0000
@@ -1,4 +1,4 @@
-maas (2.0.0~beta4+bzr4944-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.0.0~beta4+bzr4958-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
   * debian/extras/20-maas.conf: Better organize rsyslog logs.

=== modified file 'debian/extras/20-maas.conf'
--- debian/extras/20-maas.conf	2016-04-21 02:46:14 +0000
+++ debian/extras/20-maas.conf	2016-04-26 23:18:33 +0000
@@ -29,9 +29,12 @@
 
 if $hostname == "maas-enlisting-node" then {
   :fromhost-ip, !isequal, "127.0.0.1" ?MAASenlist
+  # Stop messages that came from anywhere else from going into other places
+  # like /var/log/syslog. If you want to see these messages there, then comment below
+  & ~
 } else {
   :fromhost-ip, !isequal, "127.0.0.1" ?MAASboot
+  # Stop messages that came from anywhere else from going into other places
+  # like /var/log/syslog. If you want to see these messages there, then comment below
+  & ~
 }
-# Stop messages that came from anywhere else from going into other places
-# like /var/log/syslog. If you want to see these messages there, then comment below
-& ~