Merge lp:~timkuhlman/charms/trusty/rsyslog-forwarder-ha/no-duplicate-kern into lp:charms/trusty/rsyslog-forwarder-ha

[Tim Kuhlman]

When logs are kept locally kernel messages are being duplicated to syslog and messages files as well as to kern.log. This change makes it so they only go to kern.log

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5344/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5448/

review: Approve (automated testing)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-06-06 17:09:07 +0000
+++ hooks/hooks.py	2016-08-25 16:07:08 +0000
@@ -52,10 +52,10 @@
 ]
 
 
-IMFILE_FILE = '/etc/rsyslog.d/75-rsyslog-imfile.conf'
+IMFILE_FILE = '/etc/rsyslog.d/40-rsyslog-imfile.conf'
 LOGS_TEMPLATE = 'keep_local.template'
 LOGS_SYSTEM_FILE = '/etc/rsyslog.d/50-default.conf'
-REPLICATION_FILE = '/etc/rsyslog.d/80-rsyslog-replication.conf'
+REPLICATION_FILE = '/etc/rsyslog.d/45-rsyslog-replication.conf'
 
 
 hooks = Hooks()
 
=== modified file 'templates/keep_local.template'
--- templates/keep_local.template	2014-04-25 22:18:46 +0000
+++ templates/keep_local.template	2016-08-25 16:07:08 +0000
@@ -1,9 +1,10 @@
 # Some defaults
 auth,authpriv.*                 /var/log/auth.log
+kern.*                          -/var/log/kern.log
+& ~
 *.*;auth,authpriv.none          -/var/log/syslog
 cron.*                         /var/log/cron.log
 daemon.*                        -/var/log/daemon.log
-kern.*                          -/var/log/kern.log
 lpr.*                           -/var/log/lpr.log
 mail.*                          -/var/log/mail.log
 user.*                          -/var/log/user.log