aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Bertsch <andreas.bertsch@dfki.de>2020-08-30 16:15:21 +0200
committerRasmus Thomsen <oss@cogitri.dev>2020-09-05 23:59:30 +0200
commit5364bae363d0838497a443a6ab3e20928201a512 (patch)
tree58d2e25063e61b5491dd57e43211d11c84ec63e9
parent4b4e23dd79080546639301a5770af079220e8039 (diff)
downloadaports-5364bae363.tar.gz
aports-5364bae363.tar.bz2
aports-5364bae363.tar.xz
main/rsyslog: move config loading behind module loading to allow module directives in config files
-rw-r--r--main/rsyslog/APKBUILD4
-rw-r--r--main/rsyslog/rsyslog.conf9
2 files changed, 8 insertions, 5 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index 951e275384..fc780b9311 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -6,7 +6,7 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=rsyslog
pkgver=8.2006.0
-pkgrel=1
+pkgrel=2
pkgdesc="Enhanced multi-threaded syslogd with database support and more."
url="https://www.rsyslog.com/"
arch="all !s390x" # limited by czmq
@@ -190,6 +190,6 @@ _plugin() {
sha512sums="33d4d9d729d690803e2b02106d7e0f930be78c10fb6c7d05ded739472b5534d5ea66c870b2b7bd348ff107eced68b3d4e34ed53779eadfaf8456cac1d81373b3 rsyslog-8.2006.0.tar.gz
bcd63c8df2ac63b80f3cb51ba7f544988df6cd875f4e81020e762dff30d7537f21b72c95a4b1c08baf15f4ed5f03defbf3f061673aabada5841f45ab9f579374 rsyslog.initd
198ad8f617b9edb93c9231118a9b3bb80b1e00e6517d2a79c393cbfef4417b8f0d08f231fb33843f8e9b09c7f9bc69dd501057ffe9eef583108af34996fee59d rsyslog.logrotate
-517e3c9fced414d397ce946eed50534ea821cd1a7aee2e873d5ffa4c4df3b4433b4f2a2e063825641ce6aaeddd5bd1fd2508ad34099fe30d0d3d615d25121f67 rsyslog.conf
+9702ca98b5228058e5a45565cb5d39f3ee565f7ec0612ddb93eb5e8c045f3f2fded93ea822311daf79366f0fa571cbd8a894cdfc8ce97af1d6cff2373922971f rsyslog.conf
15745c8cdb730ae548d038ca4c04f9f48ef55c6e04949a8e86df356877563c0fcb9660445e47d3f9530925092d6dd80b2b2fc3f64a114ee85103d137327524cb musl-fix.patch
ef2e000b1c42cb5beffb26393952c2a692791e78972ee4b6f187ca53e338122b2004cc5216381c042195f12cc58f37f186a04e12a65b5bdfdcdf76b73393efb7 queue.patch"
diff --git a/main/rsyslog/rsyslog.conf b/main/rsyslog/rsyslog.conf
index 99b715e7a8..8319b99a97 100644
--- a/main/rsyslog/rsyslog.conf
+++ b/main/rsyslog/rsyslog.conf
@@ -23,9 +23,6 @@ $Umask 0022
# Reduce repeating messages (default off).
#$RepeatedMsgReduction on
-# Include all config files in /etc/rsyslog.d/.
-include(file="/etc/rsyslog.d/*.conf" mode="optional")
-
#### Modules ####
@@ -66,6 +63,12 @@ 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.