From da6fab5bff46bf866e665b30b96544fc5204374d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 10 Apr 2025 09:44:03 +0200 Subject: [PATCH] backend: adjust for #8525 --- src/opnsense/service/conf/actions.d/actions_dnsmasq.conf | 3 ++- src/opnsense/service/conf/actions.d/actions_filter.conf | 6 ++++-- src/opnsense/service/conf/actions.d/actions_ids.conf | 6 +++--- .../service/conf/actions.d/actions_interface.conf | 3 ++- src/opnsense/service/conf/actions.d/actions_monit.conf | 6 ++++-- src/opnsense/service/conf/actions.d/actions_netflow.conf | 9 ++++++--- src/opnsense/service/conf/actions.d/actions_shaper.conf | 3 ++- src/opnsense/service/conf/actions.d/actions_syslog.conf | 3 ++- src/opnsense/service/conf/actions.d/actions_unbound.conf | 3 ++- 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/opnsense/service/conf/actions.d/actions_dnsmasq.conf b/src/opnsense/service/conf/actions.d/actions_dnsmasq.conf index 1e1d0d84c..0c2fea43e 100644 --- a/src/opnsense/service/conf/actions.d/actions_dnsmasq.conf +++ b/src/opnsense/service/conf/actions.d/actions_dnsmasq.conf @@ -15,7 +15,8 @@ message:Restarting Dnsmasq description:Restart Dnsmasq DNS service [status] -command:/usr/local/etc/rc.d/dnsmasq status; exit 0 +command:/usr/local/etc/rc.d/dnsmasq status +errors:no type:script_output message:Request Dnsmasq status diff --git a/src/opnsense/service/conf/actions.d/actions_filter.conf b/src/opnsense/service/conf/actions.d/actions_filter.conf index 978b52447..16cde8312 100644 --- a/src/opnsense/service/conf/actions.d/actions_filter.conf +++ b/src/opnsense/service/conf/actions.d/actions_filter.conf @@ -139,7 +139,8 @@ message:kill pf table ( %s ) [kill.state] command:/sbin/pfctl -parameters: -k id -k %s/%s 2>&1 && exit 0 +parameters: -k id -k %s/%s 2>&1 +errors:no type:script_output message:kill pf state ( %s %s ) @@ -151,7 +152,8 @@ message:kill pf states [kill.gateway_states] command:/sbin/pfctl -parameters: -k gateway -k %s 2>&1; exit 0 +parameters: -k gateway -k %s 2>&1 +errors:no type:script_output message:kill pf gateway states (%s) diff --git a/src/opnsense/service/conf/actions.d/actions_ids.conf b/src/opnsense/service/conf/actions.d/actions_ids.conf index c4e8b51b0..c64abb3c0 100644 --- a/src/opnsense/service/conf/actions.d/actions_ids.conf +++ b/src/opnsense/service/conf/actions.d/actions_ids.conf @@ -68,17 +68,17 @@ description:Restart Intrusion Detection service [status] command:/usr/local/etc/rc.d/suricata status parameters: -type:script_output errors:no +type:script_output message:get suricata daemon status [update] command: /usr/local/opnsense/scripts/suricata/rule-updater.py && /usr/local/opnsense/scripts/suricata/installRules.py && - pkill -USR2 suricata ; - exit 0 + pkill -USR2 suricata parameters: +errors:no type:script message:update and reload intrusion detection rules description:Update and reload intrusion detection rules diff --git a/src/opnsense/service/conf/actions.d/actions_interface.conf b/src/opnsense/service/conf/actions.d/actions_interface.conf index a234b2cd2..9ecbebe15 100644 --- a/src/opnsense/service/conf/actions.d/actions_interface.conf +++ b/src/opnsense/service/conf/actions.d/actions_interface.conf @@ -68,7 +68,8 @@ message:request arp table [remove.arp] command:/usr/sbin/arp -d -parameters:%s 2> /dev/null; exit 0 +parameters:%s 2> /dev/null +errors:no type:script message:remove arp entry for %s diff --git a/src/opnsense/service/conf/actions.d/actions_monit.conf b/src/opnsense/service/conf/actions.d/actions_monit.conf index 913945f87..3fa3b3892 100644 --- a/src/opnsense/service/conf/actions.d/actions_monit.conf +++ b/src/opnsense/service/conf/actions.d/actions_monit.conf @@ -9,7 +9,8 @@ type:script message:stopping monit [status] -command:/usr/local/etc/rc.d/monit status; exit 0 +command:/usr/local/etc/rc.d/monit status +errors:no type:script_output message:get monit status @@ -25,6 +26,7 @@ type:script message:reload monit configuration [check] -command:/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh; /usr/local/bin/monit -t 2>&1; exit 0 +command:/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh; /usr/local/bin/monit -t 2>&1 +errors:no type:script_output message:testing monit configuration diff --git a/src/opnsense/service/conf/actions.d/actions_netflow.conf b/src/opnsense/service/conf/actions.d/actions_netflow.conf index 8d3a549e4..21e6e81e9 100644 --- a/src/opnsense/service/conf/actions.d/actions_netflow.conf +++ b/src/opnsense/service/conf/actions.d/actions_netflow.conf @@ -18,8 +18,9 @@ message:restart netflow description:Restart NetFlow service [status] -command:/usr/local/etc/rc.d/netflow status; exit 0 +command:/usr/local/etc/rc.d/netflow status parameters: +errors:no type:script_output message:get netflow status @@ -45,7 +46,8 @@ type:script message:restart netflow collector [collect.status] -command:/usr/local/etc/rc.d/flowd status; exit 0 +command:/usr/local/etc/rc.d/flowd status +errors:no type:script_output message:request status of netflow collector @@ -71,7 +73,8 @@ type:script message:restart netflow data aggregator [aggregate.status] -command:/usr/local/etc/rc.d/flowd_aggregate status; exit 0 +command:/usr/local/etc/rc.d/flowd_aggregate status +errors:no type:script_output message:request netflow data aggregator status diff --git a/src/opnsense/service/conf/actions.d/actions_shaper.conf b/src/opnsense/service/conf/actions.d/actions_shaper.conf index b787c511b..ac1cb4007 100644 --- a/src/opnsense/service/conf/actions.d/actions_shaper.conf +++ b/src/opnsense/service/conf/actions.d/actions_shaper.conf @@ -1,6 +1,7 @@ [reload] -command:/etc/rc.d/dnctl start; exit 0 +command:/etc/rc.d/dnctl start parameters: +errors:no type:script message:restarting dummynet diff --git a/src/opnsense/service/conf/actions.d/actions_syslog.conf b/src/opnsense/service/conf/actions.d/actions_syslog.conf index 60ef032ed..b5e2dc59f 100644 --- a/src/opnsense/service/conf/actions.d/actions_syslog.conf +++ b/src/opnsense/service/conf/actions.d/actions_syslog.conf @@ -31,7 +31,8 @@ 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 +errors:no parameters: type:script_output message:Request syslog status diff --git a/src/opnsense/service/conf/actions.d/actions_unbound.conf b/src/opnsense/service/conf/actions.d/actions_unbound.conf index 5f0c666d8..f25865f2a 100644 --- a/src/opnsense/service/conf/actions.d/actions_unbound.conf +++ b/src/opnsense/service/conf/actions.d/actions_unbound.conf @@ -47,7 +47,8 @@ type:script_output message: query specific client [qstats.reset] -command:/bin/rm -f /var/unbound/data/unbound.duckdb && configctl unbound restart; exit 0 +command:/bin/rm -f /var/unbound/data/unbound.duckdb; configctl unbound restart +errors:no parameters: type:script message: reset Unbound DNS statistics