From caf8d65b282a37db731e3ff6b06d0598183c81ba Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 18 Feb 2025 13:50:08 +0100
Subject: [PATCH] system: straighten out syslog-ng rc.d scripting

Make sure that 'pluginctl -s xxx stop' isn't used here as it
does not stop a disabled instance.  The point is moot for
syslog-ng since you cannot disable it but that only leaves
a tiny amount of daemons that still use it in core (nothing
in plugins uses it).

Also consolidate away from service(8) since we expect and
call the rc.d script directly.
---
 src/etc/inc/plugins.inc.d/core.inc             | 18 ++++++++++--------
 src/etc/inc/system.inc                         |  7 +------
 .../service/conf/actions.d/actions_syslog.conf |  4 ++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/core.inc b/src/etc/inc/plugins.inc.d/core.inc
index fd1a18cf2..d2115054f 100644
--- a/src/etc/inc/plugins.inc.d/core.inc
+++ b/src/etc/inc/plugins.inc.d/core.inc
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2018-2022 Deciso B.V.
+ * Copyright (C) 2018-2025 Deciso B.V.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,16 +108,18 @@ function core_services()
         'name' => 'cron',
     );
 
-    $services[] = array(
+    $services[] = [
         'description' => gettext('Syslog-ng Daemon'),
-        'php' => array(
-            'stop' => array('system_syslog_stop'),
-            'start' => array('system_syslog_start'),
-            'restart' => array('system_syslog_start')
-        ),
+        'php' => [
+            'start' => ['system_syslog_start'],
+            'restart' => ['system_syslog_start'],
+        ],
+        'configd' => [
+            'stop' => ['syslog stop'],
+        ],
         'pidfile' => '/var/run/syslog-ng.pid',
         'name' => 'syslog-ng',
-    );
+    ];
 
     return $services;
 }
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 86f2b7f16..16873561e 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -818,7 +818,7 @@ function system_syslog_start($verbose = false)
     if (isvalidpid('/var/run/syslog-ng.pid') && $last_version == $this_version) {
         mwexecf('/usr/local/sbin/syslog-ng-ctl reload');
     } else {
-        mwexecf('/usr/sbin/service syslog-ng restart');
+        mwexecf('/usr/local/etc/rc.d/syslog-ng restart');
     }
 
     file_put_contents('/var/run/syslog-ng.version', $this_version);
@@ -826,11 +826,6 @@ function system_syslog_start($verbose = false)
     service_log("done.\n", $verbose);
 }
 
-function system_syslog_stop()
-{
-    mwexecf('/usr/sbin/service syslog-ng stop');
-}
-
 function system_syslog_reset($verbose = false)
 {
     $it = new RecursiveDirectoryIterator('/var/log');
diff --git a/src/opnsense/service/conf/actions.d/actions_syslog.conf b/src/opnsense/service/conf/actions.d/actions_syslog.conf
index 3ba4ed631..60ef032ed 100644
--- a/src/opnsense/service/conf/actions.d/actions_syslog.conf
+++ b/src/opnsense/service/conf/actions.d/actions_syslog.conf
@@ -12,7 +12,7 @@ type:script
 message:Starting syslog
 
 [stop]
-command:/usr/local/sbin/pluginctl -s syslog-ng stop
+command:/usr/local/etc/rc.d/syslog-ng stop
 parameters:
 type:script
 message:Stopping syslog
@@ -31,7 +31,7 @@ type:script
 message:Reload syslog
 
 [status]
-command:/usr/local/etc/rc.d/syslog-ng status;exit 0
+command:/usr/local/etc/rc.d/syslog-ng status; exit 0
 parameters:
 type:script_output
 message:Request syslog status