From f9e9cc6f6fb1d1c953cdd84389d930d4bc037613 Mon Sep 17 00:00:00 2001 From: Deepak Kodihalli Date: Tue, 21 Aug 2018 06:40:53 -0500 Subject: Pull rsyslog into image The intent is to use rsyslog for streaming journal logs off of the BMC. Since this is the only intent (i.e at the moment there's no requirement to employ rsyslog for local logging), modify rsyslog.conf accordingly. (From meta-phosphor rev: a549e7540ede46686c5011ac2f7209704643a2d6) Change-Id: I01d7dbd648da82536085f7586efcd7f1c7dd8ae0 Signed-off-by: Deepak Kodihalli Signed-off-by: Brad Bishop --- .../recipes-extended/rsyslog/rsyslog/rsyslog.conf | 3 +++ .../recipes-extended/rsyslog/rsyslog/server.conf | 2 ++ .../recipes-extended/rsyslog/rsyslog_%.bbappend | 16 ++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 meta-phosphor/recipes-extended/rsyslog/rsyslog/rsyslog.conf create mode 100644 meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf create mode 100644 meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend (limited to 'meta-phosphor/recipes-extended/rsyslog') diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-phosphor/recipes-extended/rsyslog/rsyslog/rsyslog.conf new file mode 100644 index 000000000..40b3f294f --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -0,0 +1,3 @@ +$ModLoad imuxsock + +$IncludeConfig /etc/rsyslog.d/server.conf diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf new file mode 100644 index 000000000..5c8161b29 --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf @@ -0,0 +1,2 @@ +# Remote Logging (we use TCP for reliable delivery) +#*.* @@remote-host:port diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend new file mode 100644 index 000000000..0a2fb3334 --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -0,0 +1,16 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://rsyslog.conf \ + file://server.conf \ +" + +PACKAGECONFIG ??= " \ + rsyslogd rsyslogrt inet regexp uuid \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" + +do_install_append(){ + install -m 0644 -D ${WORKDIR}/server.conf \ + ${D}${sysconfdir}/rsyslog.d/server.conf +} -- cgit v1.2.3