From 1d2b65dcadf2fdeb997ad345eef5a70256b767e7 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 19 Aug 2022 08:13:55 +0200
Subject: [PATCH] www/c-icap: migrate to NAME_setup use

PR: https://github.com/opnsense/core/issues/5917
---
 www/c-icap/Makefile                                       | 2 +-
 .../opnsense/service/conf/actions.d/actions_cicap.conf    | 8 ++++----
 .../src/opnsense/service/templates/OPNsense/CICAP/c_icap  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 9f1fe36ab..095dfd162 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		c-icap
 PLUGIN_VERSION=		1.7
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_COMMENT=		c-icap connects the web proxy with a virus scanner
 PLUGIN_DEPENDS=		c-icap c-icap-modules
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/www/c-icap/src/opnsense/service/conf/actions.d/actions_cicap.conf b/www/c-icap/src/opnsense/service/conf/actions.d/actions_cicap.conf
index 0d564d26a..db3586e14 100644
--- a/www/c-icap/src/opnsense/service/conf/actions.d/actions_cicap.conf
+++ b/www/c-icap/src/opnsense/service/conf/actions.d/actions_cicap.conf
@@ -1,23 +1,23 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/CICAP/setup.sh;/usr/local/etc/rc.d/c-icap start
+command:/usr/local/etc/rc.d/c-icap start
 parameters:
 type:script
 message:starting c-icap
 
 [stop]
-command:/usr/local/etc/rc.d/c-icap stop; exit 0
+command:/usr/local/etc/rc.d/c-icap stop
 parameters:
 type:script
 message:stopping c-icap
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/CICAP/setup.sh;/usr/local/etc/rc.d/c-icap restart
+command:/usr/local/etc/rc.d/c-icap restart
 parameters:
 type:script
 message:restarting c-icap
 
 [status]
-command:/usr/local/etc/rc.d/c-icap status;exit 0
+command:/usr/local/etc/rc.d/c-icap status; exit 0
 parameters:
 type:script_output
 message:request c-icap status
diff --git a/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c_icap b/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c_icap
index 4be32766d..f8da98c94 100644
--- a/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c_icap
+++ b/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c_icap
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.cicap.general.enabled') and OPNsense.cicap.general.enabled == '1' %}
-c_icap_var_script="/usr/local/opnsense/scripts/OPNsense/CICAP/setup.sh"
+c_icap_setup="/usr/local/opnsense/scripts/OPNsense/CICAP/setup.sh"
 c_icap_enable="YES"
 {% else %}
 c_icap_enable="NO"