From 201ef5ea217ef9398f44e02efd952f5db657c917 Mon Sep 17 00:00:00 2001
From: "Fabian Franz, BSc" <fabianfrz@users.noreply.github.com>
Date: Sat, 18 Nov 2017 14:23:12 +0100
Subject: [PATCH] databases/redis: add requested changes by @fichtner (#379)

* fix up some stuff in redis
* don't allow to disable the TCP Port
---
 .../mvc/app/controllers/OPNsense/Redis/forms/settings.xml    | 4 ++--
 .../src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml     | 5 ++---
 .../src/opnsense/service/conf/actions.d/actions_redis.conf   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/forms/settings.xml b/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/forms/settings.xml
index 6a9252f75..71818823e 100644
--- a/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/forms/settings.xml
+++ b/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/forms/settings.xml
@@ -12,7 +12,7 @@
         <label>Listen Interfaces</label>
         <type>select_multiple</type>
         <style>selectpicker</style>
-        <help>Let the Redis server listen on non localhost interfaces.</help>
+        <help>Let the Redis server listen on non-localhost interfaces.</help>
       </field>
       <field>
         <id>redis.general.protected_mode</id>
@@ -24,7 +24,7 @@
         <id>redis.general.port</id>
         <label>TCP Listen Port</label>
         <type>text</type>
-        <help>Enter a valid TCP port or 0 to disable the TCP port.</help>
+        <help>Enter a valid TCP port.</help>
       </field>
       <field>
         <id>redis.general.log_level</id>
diff --git a/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml b/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml
index 6356f3900..0750ed1d8 100644
--- a/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml
+++ b/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml
@@ -8,7 +8,6 @@
         <Required>Y</Required>
       </enabled>
       <listen type="InterfaceField">
-        <default>1</default>
         <Required>N</Required>
         <multiple>Y</multiple>
       </listen>
@@ -17,11 +16,11 @@
         <Required>Y</Required>
       </protected_mode>
       <port type="IntegerField">
-        <MinimumValue>0</MinimumValue>
+        <MinimumValue>1</MinimumValue>
         <MaximumValue>65536</MaximumValue>
         <Required>N</Required>
         <default>6379</default>
-        <ValidationMessage>This must be a valid port number or 0.</ValidationMessage>
+        <ValidationMessage>This must be a valid port number.</ValidationMessage>
       </port>
       <log_level type="OptionField">
         <Required>Y</Required>
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
index ee699dde3..e24aeda3f 100644
--- a/databases/redis/src/opnsense/service/conf/actions.d/actions_redis.conf
+++ b/databases/redis/src/opnsense/service/conf/actions.d/actions_redis.conf
@@ -5,7 +5,7 @@ type:script
 message:starting redis
 
 [stop]
-command:/usr/local/etc/rc.d/redis onestop
+command:/usr/local/etc/rc.d/redis stop
 parameters:
 type:script
 message:stopping redis