summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor/recipes-extended')
-rw-r--r--meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf3
-rw-r--r--meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf1
-rw-r--r--meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend6
3 files changed, 7 insertions, 3 deletions
diff --git a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf
deleted file mode 100644
index 458f52f27..000000000
--- a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-# This file exists only if remote logging has been configured
-ConditionPathExists=/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..cf47ba306
--- /dev/null
+++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf
@@ -0,0 +1 @@
+*.* ~
diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend
index 3901844ae..0a2fb3334 100644
--- a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend
+++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend
@@ -2,9 +2,15 @@ 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
+}