aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Riomar <henrik.riomar@gmail.com>2021-07-08 08:15:45 +0200
committerLeo <thinkabit.ukim@gmail.com>2021-07-08 06:00:10 -0300
commitf89daf38a0d74524f8b4e214147be8965c64126d (patch)
treeea75104ca2bc4e34535c10c7f0dbb9b9b4cc31fb
parentc338d5b2cfa080d24cd7a8497554ce561d1f8fd8 (diff)
downloadaports-f89daf38a0d74524f8b4e214147be8965c64126d.tar.gz
aports-f89daf38a0d74524f8b4e214147be8965c64126d.tar.bz2
aports-f89daf38a0d74524f8b4e214147be8965c64126d.tar.xz
main/rsyslog: load custom config before standard rules
We must include config files before the standard rules or else the standard logs will be full with data the user have configured filters for. This problem was introduced in: 5364bae363 main/rsyslog: move config loading behind module loading to allow module directives in config files
-rw-r--r--main/rsyslog/APKBUILD10
-rw-r--r--main/rsyslog/rsyslog.conf10
2 files changed, 10 insertions, 10 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index fc8cbc7777..209b42f3c1 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -6,7 +6,7 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=rsyslog
pkgver=8.2012.0
-pkgrel=0
+pkgrel=1
pkgdesc="Enhanced multi-threaded syslogd with database support and more"
url="https://www.rsyslog.com/"
arch="all !s390x" # limited by czmq
@@ -187,9 +187,11 @@ _plugin() {
done
}
-sha512sums="78a6f8499340a18b71da22788bb3323ac12f804725b2bb00e939ef6bd4cb6b803e5384a179ddee7db99bf49f2b963419fc26b1bf2d875f6aff7b58fdd4d254b2 rsyslog-8.2012.0.tar.gz
+sha512sums="
+78a6f8499340a18b71da22788bb3323ac12f804725b2bb00e939ef6bd4cb6b803e5384a179ddee7db99bf49f2b963419fc26b1bf2d875f6aff7b58fdd4d254b2 rsyslog-8.2012.0.tar.gz
bcd63c8df2ac63b80f3cb51ba7f544988df6cd875f4e81020e762dff30d7537f21b72c95a4b1c08baf15f4ed5f03defbf3f061673aabada5841f45ab9f579374 rsyslog.initd
198ad8f617b9edb93c9231118a9b3bb80b1e00e6517d2a79c393cbfef4417b8f0d08f231fb33843f8e9b09c7f9bc69dd501057ffe9eef583108af34996fee59d rsyslog.logrotate
-9702ca98b5228058e5a45565cb5d39f3ee565f7ec0612ddb93eb5e8c045f3f2fded93ea822311daf79366f0fa571cbd8a894cdfc8ce97af1d6cff2373922971f rsyslog.conf
+451b861dc82d7a2810e6c9ff8f80b2c5149cc6b440baf5901149e7b6524a1179826787a924c84403c2e9d8fa7d4df2c909e7f0877ac0cd4e6faf2e37cba7c6c1 rsyslog.conf
15745c8cdb730ae548d038ca4c04f9f48ef55c6e04949a8e86df356877563c0fcb9660445e47d3f9530925092d6dd80b2b2fc3f64a114ee85103d137327524cb musl-fix.patch
-ef2e000b1c42cb5beffb26393952c2a692791e78972ee4b6f187ca53e338122b2004cc5216381c042195f12cc58f37f186a04e12a65b5bdfdcdf76b73393efb7 queue.patch"
+ef2e000b1c42cb5beffb26393952c2a692791e78972ee4b6f187ca53e338122b2004cc5216381c042195f12cc58f37f186a04e12a65b5bdfdcdf76b73393efb7 queue.patch
+"
diff --git a/main/rsyslog/rsyslog.conf b/main/rsyslog/rsyslog.conf
index 8319b99a97..a279fdd09a 100644
--- a/main/rsyslog/rsyslog.conf
+++ b/main/rsyslog/rsyslog.conf
@@ -35,6 +35,10 @@ module(load="imuxsock")
# Reads kernel messages.
module(load="imklog")
+#### Config files ####
+
+# Include all config files in /etc/rsyslog.d/.
+include(file="/etc/rsyslog.d/*.conf" mode="optional")
#### Rules ####
@@ -63,12 +67,6 @@ cron.* -/var/log/cron.log
#kern.* /dev/console
-#### Config files ####
-
-# Include all config files in /etc/rsyslog.d/.
-include(file="/etc/rsyslog.d/*.conf" mode="optional")
-
-
### Examples ####
# Send all logs to remote syslog via UDP.