diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-08-06 10:23:47 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-05 23:31:28 -0700 |
commit | 36ddb5233cdfe9306c4a18c9d5ad74cbc4ebf6f2 (patch) | |
tree | a9d734a598e053a39cddec7f12a94ace76867f0b /meta-oe/recipes-extended/rsyslog | |
parent | 88c8866fbc5d809987b67eda290c545e4d46c660 (diff) | |
download | meta-openembedded-36ddb5233cdfe9306c4a18c9d5ad74cbc4ebf6f2.tar.gz |
rsyslog: add PACKAGECONFIG for imjournal
Add PACKAGECONFIG for imjournal, and add corresponding configuration
to /etc/rsyslog.d/imjournal.conf when it's enabled. Default to disable it.
This patch also enables rsyslog.conf to include configuration files
/etc/rsyslog.d/*.conf.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog')
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf | 5 | ||||
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf index 324ae6d82..dbfefb759 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf | |||
@@ -84,3 +84,8 @@ $ActionQueueMaxDiskSpace 10m # 1gb space limit (use as much as possible) | |||
84 | # UDP Syslog Server: | 84 | # UDP Syslog Server: |
85 | #$ModLoad imudp.so # provides UDP syslog reception | 85 | #$ModLoad imudp.so # provides UDP syslog reception |
86 | #$UDPServerRun 514 # start a UDP syslog server at standard port 514 | 86 | #$UDPServerRun 514 # start a UDP syslog server at standard port 514 |
87 | |||
88 | # | ||
89 | # Include all config files in /etc/rsyslog.d/ | ||
90 | # | ||
91 | $IncludeConfig /etc/rsyslog.d/*.conf | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb index d90695a60..13c1f56ee 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | |||
@@ -67,6 +67,7 @@ PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," | |||
67 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," | 67 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," |
68 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," | 68 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," |
69 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," | 69 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," |
70 | PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," | ||
70 | PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," | 71 | PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," |
71 | PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," | 72 | PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," |
72 | PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," | 73 | PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," |
@@ -126,6 +127,11 @@ do_install_append() { | |||
126 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf | 127 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf |
127 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | 128 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog |
128 | sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | 129 | sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog |
130 | |||
131 | if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then | ||
132 | install -d 0755 ${D}${sysconfdir}/rsyslog.d | ||
133 | echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf | ||
134 | fi | ||
129 | } | 135 | } |
130 | 136 | ||
131 | FILES_${PN} += "${bindir}" | 137 | FILES_${PN} += "${bindir}" |