summaryrefslogtreecommitdiff
path: root/sysconf/rsyslog.conf
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-06-24 12:50:17 +0200
committerDaniil Baturin <daniil@baturin.org>2018-06-24 12:50:17 +0200
commitbacecf80ea16d3cd30dc7c98c98af013b2adc258 (patch)
tree2b1d6f48708ace28ae4f6c9893ee50f6f390c6b7 /sysconf/rsyslog.conf
parent0d8e75e2e808ccf366a1527647a6353c09d92237 (diff)
parent0f19dc57ed6588c083eee8aa9aee09b92b441b08 (diff)
downloadvyatta-cfg-system-lithium.tar.gz
vyatta-cfg-system-lithium.zip
Merge branch 'current' into lithiumlithium
Conflicts: debian/changelog scripts/snmp/vyatta-snmp-v3.pl scripts/snmp/vyatta-snmp.pl templates/interfaces/tunnel/node.def templates/system/sysctl/custom/node.def
Diffstat (limited to 'sysconf/rsyslog.conf')
-rw-r--r--sysconf/rsyslog.conf8
1 files changed, 7 insertions, 1 deletions
diff --git a/sysconf/rsyslog.conf b/sysconf/rsyslog.conf
index 56c7e15c..7db872bf 100644
--- a/sysconf/rsyslog.conf
+++ b/sysconf/rsyslog.conf
@@ -12,6 +12,9 @@ $ModLoad imuxsock # provides support for local system logging
$ModLoad imklog # provides kernel logging support (previously done by rklogd)
#$ModLoad immark # provides --MARK-- message capability
+$OmitLocalLogging no
+$SystemLogSocketName /run/systemd/journal/syslog
+
$KLogPath /proc/kmsg
# provides UDP syslog reception
@@ -54,8 +57,11 @@ $IncludeConfig /etc/rsyslog.d/*.conf
#### RULES ####
###############
+daemon.* /var/log/messages
+
# Log authorization failure messages
auth,authpriv.* /var/log/auth.log
# Emergencies are sent to everybody logged in.
-*.emerg *
+*.emerg :omusrmsg:*
+