From d3b7d342d66d35311db9a8643986513073b261cb Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 21 Oct 2022 09:59:37 +0200
Subject: [PATCH] net/siproxd: use NAME_setup

PR: https://github.com/opnsense/core/issues/5917
---
 .../OPNsense/Siproxd/Api/ServiceController.php       |  2 +-
 .../service/conf/actions.d/actions_siproxd.conf      | 12 ++++++------
 .../service/templates/OPNsense/Siproxd/siproxd       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
index e1634191f..6e934931a 100644
--- a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
+++ b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
@@ -46,7 +46,7 @@ class ServiceController extends ApiControllerBase
     public function showregistrationsAction()
     {
         $backend = new Backend();
-        $response = $backend->configdRun("siproxd show-registrations");
+        $response = $backend->configdRun('siproxd registrations');
         return array("response" => $response);
     }
 
diff --git a/net/siproxd/src/opnsense/service/conf/actions.d/actions_siproxd.conf b/net/siproxd/src/opnsense/service/conf/actions.d/actions_siproxd.conf
index 37fbfae76..82cf4df4e 100644
--- a/net/siproxd/src/opnsense/service/conf/actions.d/actions_siproxd.conf
+++ b/net/siproxd/src/opnsense/service/conf/actions.d/actions_siproxd.conf
@@ -1,29 +1,29 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/Siproxd/setup.sh;/usr/local/etc/rc.d/siproxd start
+command:/usr/local/etc/rc.d/siproxd start
 parameters:
 type:script
 message:starting Siproxd
 
 [stop]
-command:/usr/local/etc/rc.d/siproxd stop; exit 0
+command:/usr/local/etc/rc.d/siproxd stop
 parameters:
 type:script
 message:stopping Siproxd
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/Siproxd/setup.sh;/usr/local/etc/rc.d/siproxd restart
+command:/usr/local/etc/rc.d/siproxd restart
 parameters:
 type:script
 message:restarting Siproxd
 
 [status]
-command:/usr/local/etc/rc.d/siproxd status;exit 0
+command:/usr/local/etc/rc.d/siproxd status; exit 0
 parameters:
 type:script_output
 message:request Siproxd status
 
-[show-registrations]
+[registrations]
 command:/bin/cat /var/lib/siproxd/siproxd_registrations
 parameters:
 type:script_output
-message: Show registered devices
+message:show registered devices
diff --git a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd
index 9c3277f96..b836d595d 100644
--- a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd
+++ b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.siproxd.general.enabled') and OPNsense.siproxd.general.enabled == '1' %}
-siproxd_var_script="/usr/local/opnsense/scripts/OPNsense/Siproxd/setup.sh"
+siproxd_setup="/usr/local/opnsense/scripts/OPNsense/Siproxd/setup.sh"
 siproxd_enable="YES"
 {% else %}
 siproxd_enable="NO"