From a3cea3655f3f61f0df657b9e6bb8ff0d07873d2c Mon Sep 17 00:00:00 2001 From: Giacomo Sanchietti Date: Thu, 9 Jun 2022 14:27:12 +0200 Subject: [PATCH] rsyslog: preserve existing configuration Signed-off-by: Giacomo Sanchietti --- admin/rsyslog/Makefile | 4 ++-- admin/rsyslog/files/20_rsyslog | 33 +++++++++++++++++++++++++++++ admin/rsyslog/files/rsyslog | 28 ------------------------- admin/rsyslog/files/rsyslog.conf | 36 ++++++++++++++++---------------- 4 files changed, 53 insertions(+), 48 deletions(-) create mode 100644 admin/rsyslog/files/20_rsyslog delete mode 100644 admin/rsyslog/files/rsyslog diff --git a/admin/rsyslog/Makefile b/admin/rsyslog/Makefile index a93595df19..d27778f31f 100644 --- a/admin/rsyslog/Makefile +++ b/admin/rsyslog/Makefile @@ -72,8 +72,8 @@ define Package/rsyslog/install $(INSTALL_CONF) ./files/rsyslog.conf $(1)/etc $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/rsyslog.init $(1)/etc/init.d/rsyslog - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/rsyslog $(1)/etc/config + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_CONF) ./files/20_rsyslog $(1)/etc/uci-defaults endef define Package/rsyslog/config diff --git a/admin/rsyslog/files/20_rsyslog b/admin/rsyslog/files/20_rsyslog new file mode 100644 index 0000000000..6fd008a066 --- /dev/null +++ b/admin/rsyslog/files/20_rsyslog @@ -0,0 +1,33 @@ +[ "$(sed -e '/^#/d' -e '/^\s*$/d' /etc/rsyslog.conf)" != "" ] && exit 0 +[ "$(uci -q get rsyslog.syslog)" == "syslog" ] && exit 0 + +uci -q import rsyslog << EOI +config syslog 'syslog' + option tcp_input_port '514' + option udp_input '1' + option tcp_input '0' + option udp_input_port '514' + option default_template 'RSYSLOG_TraditionalFileFormat' + list modules 'imuxsock' + list modules 'imklog' + +config selector + option source '*.info;mail.none;authpriv.none;cron.none' + option destination '/var/log/messages' + +config selector + option source 'authpriv.*' + option destination '/var/log/secure' + +config selector + option source 'mail.*' + option destination '/var/log/maillog' + +config selector + option source 'cron.*' + option destination '/var/log/cron' + +config selector + option source 'local7.*' + option destination '/var/log/boot.log' +EOI diff --git a/admin/rsyslog/files/rsyslog b/admin/rsyslog/files/rsyslog deleted file mode 100644 index b4cd422f62..0000000000 --- a/admin/rsyslog/files/rsyslog +++ /dev/null @@ -1,28 +0,0 @@ -config syslog syslog - option tcp_input '0' - option tcp_input_port '514' - option udp_input '1' - option udp_input_port '514' - option default_template 'RSYSLOG_TraditionalFileFormat' - list modules 'imuxsock' - list modules 'imklog' - -config selector - option source '*.info;mail.none;authpriv.none;cron.none' - option destination '/var/log/messages' - -config selector - option source 'authpriv.*' - option destination '/var/log/secure' - -config selector - option source 'mail.*' - option destination '/var/log/maillog' - -config selector - option source 'cron.*' - option destination '/var/log/cron' - -config selector - option source 'local7.*' - option destination '/var/log/boot.log' diff --git a/admin/rsyslog/files/rsyslog.conf b/admin/rsyslog/files/rsyslog.conf index 5aaed415b5..0381b3e6f2 100644 --- a/admin/rsyslog/files/rsyslog.conf +++ b/admin/rsyslog/files/rsyslog.conf @@ -1,18 +1,18 @@ -module(load="imuxsock") -module(load="imklog") -module(load="imudp") -input(type="imudp" port="514") -#module(load="imtcp") -#input(type="imtcp" port="514") - -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat - -*.info;mail.none;authpriv.none;cron.none /var/log/messages - -authpriv.* /var/log/secure - -mail.* /var/log/maillog - -cron.* /var/log/cron - -local7.* /var/log/boot.log +# +# The preferred way to configure rsyslogd is now UCI. +# +# This file can be still used and will be included +# on top of the final configuration inside /var/etc/rsyslog.conf +# +# Example of default configuration: +# +# module(load="imuxsock") +# module(load="imklog") +# module(load="imudp") +# input(type="imudp" port="514") +# $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +# *.info;mail.none;authpriv.none;cron.none /var/log/messages +# authpriv.* /var/log/secure +# mail.* /var/log/maillog +# cron.* /var/log/cron +# local7.* /var/log/boot.log -- 2.30.2