From 5efcdf226ceab10275f16f6c86b377b535105b2c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 11 Feb 2023 22:49:43 -0500
Subject: rsyslog: rsyslog.conf: udpate defaults

---
 linhes/rsyslog/PKGBUILD     |  4 ++--
 linhes/rsyslog/rsyslog.conf | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/linhes/rsyslog/PKGBUILD b/linhes/rsyslog/PKGBUILD
index 567df1d..bb7af2b 100644
--- a/linhes/rsyslog/PKGBUILD
+++ b/linhes/rsyslog/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=rsyslog
 pkgver=8.2212.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('x86_64' 'i686' 'aarch64')
@@ -22,7 +22,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/rsyslog/rsyslog/archive/v${
 
 sha256sums=('4b5f2205e91adf5e5821de8957a42b937505607f663c71ee381aca0011ea8e42'
             '0f5bea3fd4dff2c9f097bf95768b2e1f6e9cfd9a08eab98bc3b3b4d2ed44119a'
-            '0a28fcc346cd47e8142cdbb5df7503277f624b59a9ec783adb1581d65e92b041'
+            '4f2f0ed01a717d89ecd37b41c02ed33cd28876397035bcedd4e74b173bfa7ce3'
             '81b9f9b78395405b679849143a6709911d00e9317928fdb2a2540f52965847c2')
 install=$pkgname.install
 
diff --git a/linhes/rsyslog/rsyslog.conf b/linhes/rsyslog/rsyslog.conf
index 843bdd4..feb9621 100644
--- a/linhes/rsyslog/rsyslog.conf
+++ b/linhes/rsyslog/rsyslog.conf
@@ -1,24 +1,29 @@
-# Minimal config
+# if you experience problems, check
+# http://www.rsyslog.com/troubleshoot for assistance
 
+$ModLoad immark   # provides --MARK-- message capability
 $ModLoad imuxsock # provides support for local system logging
 $ModLoad imklog   # provides kernel logging support
+$ModLoad imjournal # Provides the ability to import log messages from systemd journal
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 $FileOwner root
 $FileGroup root
-$FileCreateMode 0640
+$FileCreateMode 0644
 $DirCreateMode 0755
 $Umask 0022
+$SystemLogRateLimitInterval 2
+$SystemLogRateLimitBurst 500
 $WorkDirectory /var/spool/rsyslog
 $IncludeConfig /etc/rsyslog.d/*.conf
 
 
-$template DailyPerHostLogs,"/var/log/%HOSTNAME%_messages.log"
-$template DynFile,"/var/log/%HOSTNAME%_%programname%.log"
-$template DynMail,"/var/log/%HOSTNAME%_maillog.log"
-$template DynCron,"/var/log/%HOSTNAME%_cron.log"
-$template DynBoot,"/var/log/%HOSTNAME%_boot.log"
-$template DynSpooler,"/var/log/%HOSTNAME%_spooler.log"
-$template DynLighttpd,"/var/log/%HOSTNAME%_lighttpd.log"
+$template DailyPerHostLogs,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_messages.log"
+$template DynFile,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_%programname%.log"
+$template DynMail,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_maillog.log"
+$template DynCron,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_cron.log"
+$template DynBoot,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_boot.log"
+$template DynSpooler,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_spooler.log"
+$template DynLighttpd,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_lighttpd.log"
 
 if $programname contains 'lighttpd' then ?DynLighttpd
 & stop
-- 
cgit v0.12

