commit aa5d03b8c508d185273207708bfb302dcc6e75ad
author Benjamin Fair <benjaminfair@google.com> Tue Jun 15 18:44:03 2021 -0700
committer Benjamin Fair <benjaminfair@google.com> Fri Jun 25 19:05:37 2021 +0000
tree 02b5b59bfe87436e5b4a36fb6170a5f9ad737a71
parent abc276e2e0c6b230e83b9290d17321d01074002c

Allow configuring the rsyslog server conf path

This file will be renamed from server.conf to 90-server.conf to allow
custom rsyslog conf files to run before it.

Signed-off-by: Benjamin Fair <benjaminfair@google.com>
Change-Id: Ic2f25dc18ac5f5f4e44d58bf5f23f6d053334559

config.h.meson

diff --git a/config.h.meson b/config.h.meson
index e1cda46..e5df62c 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -19,11 +19,12 @@
 #define OBJ_ENTRY "/xyz/openbmc_project/logging/entry"
 #define OBJ_INTERNAL "/xyz/openbmc_project/logging/internal/manager"
 #define OBJ_LOGGING "/xyz/openbmc_project/logging"
-#define RSYSLOG_SERVER_CONFIG_FILE "/etc/rsyslog.d/server.conf"
 #define SYSTEMD_BUSNAME "org.freedesktop.systemd1"
 #define SYSTEMD_INTERFACE "org.freedesktop.systemd1.Manager"
 #define SYSTEMD_PATH "/org/freedesktop/systemd1"
 
+#define RSYSLOG_SERVER_CONFIG_FILE "@rsyslog_server_conf@"
+
 extern const char *ERRLOG_PERSIST_PATH;
 extern const char *EXTENSION_PERSIST_DIR;
 extern const bool IS_UNIT_TEST;

meson.build

diff --git a/meson.build b/meson.build
index 0bbf14b..e3498c0 100644
--- a/meson.build
+++ b/meson.build
@@ -71,6 +71,7 @@
 conf_data = configuration_data()
 conf_data.set('error_cap', get_option('error_cap'))
 conf_data.set('error_info_cap', get_option('error_info_cap'))
+conf_data.set('rsyslog_server_conf', get_option('rsyslog_server_conf'))
 
 configure_file(
     input: 'config.h.meson',

meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index 44869ea..3eb946e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -33,3 +33,10 @@
     value: 'disabled',
     description: 'Enable support for PHAL',
 )
+
+option(
+    'rsyslog_server_conf',
+    type: 'string',
+    value: '/etc/rsyslog.d/server.conf',
+    description: 'Path to rsyslog server conf file',
+)