From f6865ddffb13562681beda4beaeb2ea4ed20821b Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 23 Oct 2020 10:00:38 +0200 Subject: [PATCH] Syslog: make sure to start/stop the correct syslog facility, detach reconfiguration in rc.configure_plugins for https://github.com/opnsense/core/issues/4397 --- src/etc/rc.configure_plugins | 5 ++++- src/opnsense/service/conf/actions.d/actions_syslog.conf | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/etc/rc.configure_plugins b/src/etc/rc.configure_plugins index 727aed971..ebe372409 100755 --- a/src/etc/rc.configure_plugins +++ b/src/etc/rc.configure_plugins @@ -42,7 +42,10 @@ $script = !empty($argv[1]) ? $argv[1] : 'POST_INSTALL'; /* reload subsystem that may have changed */ if ($script == 'POST_INSTALL') { - system_syslogd_start(true); + echo 'Configuring system logging...'; + flush(); + configd_run("syslog restart"); + echo "done.\n"; } /* flush user-facing caches */ diff --git a/src/opnsense/service/conf/actions.d/actions_syslog.conf b/src/opnsense/service/conf/actions.d/actions_syslog.conf index bbc624736..653a4a12e 100644 --- a/src/opnsense/service/conf/actions.d/actions_syslog.conf +++ b/src/opnsense/service/conf/actions.d/actions_syslog.conf @@ -5,25 +5,25 @@ type:script_output message:list syslog applications [start] -command:/usr/local/sbin/pluginctl -s syslogd restart +command:/usr/local/sbin/pluginctl -s syslog-ng restart parameters: type:script message:starting syslog [stop] -command:/usr/local/sbin/pluginctl -s syslogd stop +command:/usr/local/sbin/pluginctl -s syslog-ng stop parameters: type:script message:stopping syslog [restart] -command:/usr/local/sbin/pluginctl -s syslogd restart +command:/usr/local/sbin/pluginctl -s syslog-ng restart parameters: type:script message:restarting syslog [reload] -command:/usr/local/sbin/pluginctl -s syslogd restart +command:/usr/local/sbin/pluginctl -s syslog-ng restart parameters: type:script message:reload syslog