diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-02-19 14:54:14 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-02-19 14:54:14 +0100 |
| commit | bc0406ce3376a28d0fb8a064395351168a93e9de (patch) | |
| tree | 8ea2b736c7bf8946fb6c96ef7c0ba068b2f8ca56 | |
| parent | 79de686b77818fb4352dc5bff083e139abe2c5e8 (diff) | |
| download | vyos-build-bc0406ce3376a28d0fb8a064395351168a93e9de.tar.gz vyos-build-bc0406ce3376a28d0fb8a064395351168a93e9de.zip | |
Enable journald log forwarding to syslog (fixes T552).
| -rw-r--r-- | data/live-build-config/includes.chroot/etc/rsyslog.conf | 67 | ||||
| -rw-r--r-- | data/live-build-config/includes.chroot/etc/systemd/journald.conf | 41 |
2 files changed, 108 insertions, 0 deletions
diff --git a/data/live-build-config/includes.chroot/etc/rsyslog.conf b/data/live-build-config/includes.chroot/etc/rsyslog.conf new file mode 100644 index 00000000..9e468ed0 --- /dev/null +++ b/data/live-build-config/includes.chroot/etc/rsyslog.conf @@ -0,0 +1,67 @@ +# /etc/rsyslog.conf Configuration file for rsyslog. +# +# For more information see +# /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html + + +################# +#### MODULES #### +################# + +$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 +#$ModLoad imudp +#$UDPServerRun 514 + +# provides TCP syslog reception +#$ModLoad imtcp +#$InputTCPServerRun 514 + + +########################### +#### GLOBAL DIRECTIVES #### +########################### + +# +# Use traditional timestamp format. +# To enable high precision timestamps, comment out the following line. +# +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +# Filter duplicated messages +$RepeatedMsgReduction on + +# +# Set the default permissions for all log files. +# +$FileOwner root +$FileGroup adm +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 + +# +# Include all config files in /etc/rsyslog.d/ +# +$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 :omusrmsg:* + diff --git a/data/live-build-config/includes.chroot/etc/systemd/journald.conf b/data/live-build-config/includes.chroot/etc/systemd/journald.conf new file mode 100644 index 00000000..07612424 --- /dev/null +++ b/data/live-build-config/includes.chroot/etc/systemd/journald.conf @@ -0,0 +1,41 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See journald.conf(5) for details. + +[Journal] +#Storage=persistent +#Compress=yes +#Seal=yes +#SplitMode=uid +#SyncIntervalSec=5m +#RateLimitIntervalSec=30s +#RateLimitBurst=1000 +#SystemMaxUse= +#SystemKeepFree= +#SystemMaxFileSize= +#SystemMaxFiles=100 +#RuntimeMaxUse= +#RuntimeKeepFree= +#RuntimeMaxFileSize= +#RuntimeMaxFiles=100 +#MaxRetentionSec= +#MaxFileSec=1month +ForwardToSyslog=yes +#ForwardToKMsg=no +#ForwardToConsole=no +#ForwardToWall=yes +#TTYPath=/dev/console +#MaxLevelStore=debug +MaxLevelSyslog=debug +#MaxLevelKMsg=notice +#MaxLevelConsole=info +#MaxLevelWall=emerg |