From 7da6fb7fe0ed10f97473d8da52cf56e68d936292 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 1 Feb 2017 00:21:54 +0100
Subject: [PATCH] net/haproxy: use proper time format for more values

---
 .../mvc/app/models/OPNsense/HAProxy/HAProxy.xml  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index b81c1ba06..ac4429add 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -611,16 +611,18 @@
                     <Required>N</Required>
                 </weight>
                 <checkInterval type="IntegerField">
-                    <default>1000</default>
-                    <MinimumValue>500</MinimumValue>
-                    <MaximumValue>100000</MaximumValue>
-                    <ValidationMessage>Please specify a value between 500 and 100000.</ValidationMessage>
+                    <default>2s</default>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>10000000</MaximumValue>
+                    <mask>/^([0-9]{1,8}(?:us|ms|s|m|h|d)?)/u</mask>
+                    <ValidationMessage>Should be a number between 1 and 8 characters, optionally followed by either "d", "h", "m", "s", "ms" or "us".</ValidationMessage>
                     <Required>Y</Required>
                 </checkInterval>
                 <checkDownInterval type="IntegerField">
-                    <MinimumValue>500</MinimumValue>
-                    <MaximumValue>100000</MaximumValue>
-                    <ValidationMessage>Please specify a value between 500 and 100000.</ValidationMessage>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>10000000</MaximumValue>
+                    <mask>/^([0-9]{1,8}(?:us|ms|s|m|h|d)?)/u</mask>
+                    <ValidationMessage>Should be a number between 1 and 8 characters, optionally followed by either "d", "h", "m", "s", "ms" or "us".</ValidationMessage>
                     <Required>N</Required>
                 </checkDownInterval>
                 <source type="TextField">