From c9edc339a52e76fb29af9d3f7e412797f2d306b1 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Sat, 30 Jan 2016 23:21:26 +0000
Subject: [PATCH] Enable rsyslog journald module and persistent journald

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 roles/base/files/rsyslog/rsyslog.conf.default       | 13 +++++++++++--
 .../rsyslog.conf.log01.phx2.fedoraproject.org       |  5 ++++-
 roles/base/tasks/main.yml                           |  9 +++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/roles/base/files/rsyslog/rsyslog.conf.default b/roles/base/files/rsyslog/rsyslog.conf.default
index 36cea98f0e..7ed3e1d891 100644
--- a/roles/base/files/rsyslog/rsyslog.conf.default
+++ b/roles/base/files/rsyslog/rsyslog.conf.default
@@ -6,7 +6,8 @@
 #### MODULES ####
 
 $ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
-$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
+$ModLoad imjournal # provides access to the systemd journal
+#$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
 #$ModLoad immark  # provides --MARK-- message capability
 
 # Provides UDP syslog reception
@@ -19,6 +20,7 @@ $ModLoad imklog   # provides kernel logging support (previously done by rklogd)
 
 
 #### GLOBAL DIRECTIVES ####
+$WorkDirectory /var/lib/rsyslog
 
 # Use default timestamp format
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
@@ -31,6 +33,13 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 $IncludeConfig /etc/rsyslog.d/*.conf
 
 
+# Turn off message reception via local log socket;
+# local messages are retrieved through imjournal now.
+$OmitLocalLogging on
+
+# File to store the position in the journal
+$IMJournalStateFile imjournal.state
+
 #### RULES ####
 
 # Log all kernel messages to the console.
@@ -52,7 +61,7 @@ mail.*                                                  -/var/log/maillog
 cron.*                                                  /var/log/cron
 
 # Everybody gets emergency messages
-*.emerg                                                 *
+*.emerg                                                 :omusrmsg:*
 
 # Save news errors of level crit and higher in a special file.
 uucp,news.crit                                          /var/log/spooler
diff --git a/roles/base/files/rsyslog/rsyslog.conf.log01.phx2.fedoraproject.org b/roles/base/files/rsyslog/rsyslog.conf.log01.phx2.fedoraproject.org
index 4fd9b858a9..0da3754b78 100644
--- a/roles/base/files/rsyslog/rsyslog.conf.log01.phx2.fedoraproject.org
+++ b/roles/base/files/rsyslog/rsyslog.conf.log01.phx2.fedoraproject.org
@@ -17,7 +17,8 @@ $MarkMessagePeriod 1200 # every 20 minutes
 $ModLoad imudp.so #udp sockets
 $ModLoad imtcp.so #tcp socks
 $ModLoad imuxsock # local syslog() listener
-$ModLoad imklog # local klog logging
+#$ModLoad imklog # local klog logging
+$ModLoad imjournal # provides access to the systemd journal
 
 
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
@@ -37,6 +38,8 @@ $InputTCPServerRun 514
 $InputTCPServerRun 5000	
 $IMUXSockRateLimitInterval 0
 $SystemLogRateLimitInterval 0
+$WorkDirectory /var/lib/rsyslog
+$IMJournalStateFile imjournal.state
 
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
 #                              T E M P L A T E S                               #
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 1ea58e9b20..676567d208 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -184,6 +184,15 @@
   - service
   - base
 
+- name: enable journald persistence
+  file: path=/var/log/journal state=directory
+        owner=root group=root mode=0600
+  when: ansible_distribution_major_version|int == 7
+  tags:
+  - journald
+  - config
+  - base
+
 - name: rsyslog.conf
   copy: src={{ item }} dest=/etc/rsyslog.conf mode=644
   with_first_found: