databases/redis: migrate to NAME_setup use

PR: opnsense/core#5917
awalon · Aug 18, 2022 · d019131 · d019131
1 parent d724f26
commit d019131
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		redis
 PLUGIN_VERSION=		1.1
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_COMMENT=		Redis DB
 PLUGIN_DEPENDS=		redis
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/databases/redis/src/opnsense/service/conf/actions.d/actions_redis.conf b/databases/redis/src/opnsense/service/conf/actions.d/actions_redis.conf
@@ -1,5 +1,5 @@
 [start]
-command:/usr/local/opnsense/scripts/redis/setup.sh;/usr/local/etc/rc.d/redis start
+command:/usr/local/etc/rc.d/redis start
 parameters:
 type:script
 message:starting redis
@@ -11,19 +11,19 @@ type:script
 message:stopping redis
 
 [restart]
-command:/usr/local/opnsense/scripts/redis/setup.sh;/usr/local/etc/rc.d/redis restart
+command:/usr/local/etc/rc.d/redis restart
 parameters:
 type:script
 message:restarting redis
 
 [status]
-command:/usr/local/etc/rc.d/redis status;exit 0
+command:/usr/local/etc/rc.d/redis status; exit 0
 parameters:
 type:script_output
 message:request redis status
 
 [resetdb]
-command:/usr/local/etc/rc.d/redis stop;rm -rf /var/db/redis
+command:/usr/local/etc/rc.d/redis stop; rm -rf /var/db/redis
 parameters:
 type:script
 message:remove all databases
diff --git a/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis b/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.redis.general.enabled') and OPNsense.redis.general.enabled == '1' %}
-redis_var_script="/usr/local/opnsense/scripts/redis/setup.sh"
+redis_setup="/usr/local/opnsense/scripts/redis/setup.sh"
 redis_enable="YES"
 {% else %}
 redis_enable="NO"