From 7308240cad0f398e365a53f711e0ecc00dbac50e Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 23 Feb 2021 23:39:40 +0100
Subject: [PATCH] net/haproxy: deprecate nbproc

---
 net/haproxy/pkg-descr                                         | 3 +++
 .../app/controllers/OPNsense/HAProxy/forms/generalTuning.xml  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/haproxy/pkg-descr b/net/haproxy/pkg-descr
index c27404a0d..4fc52805d 100644
--- a/net/haproxy/pkg-descr
+++ b/net/haproxy/pkg-descr
@@ -41,6 +41,9 @@ Changed:
 * make restart/reload commands usable in cron jobs
 * relax GUI input validation for servers, move validation to jinja template (#1975)
 
+Deprecated:
+* nbproc is deprecated and will be removed in os-haproxy 4.0
+
 2.26
 
 Fixed:
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalTuning.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalTuning.xml
index 9fdeb1e63..ea55662de 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalTuning.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalTuning.xml
@@ -12,9 +12,9 @@
     </field>
     <field>
         <id>haproxy.general.tuning.nbproc</id>
-        <label>HAProxy processes</label>
+        <label>HAProxy processes (DEPRECATED)</label>
         <type>text</type>
-        <help><![CDATA[Number of HAProxy processes to start.<br/><div class="text-info"><b>NOTE:</b> You may experience random issues in multi-process mode. For more information about the "nbproc" option please see the HAProxy Documentation.</div>]]></help>
+        <help><![CDATA[Number of HAProxy processes to start.<br/><div class="text-info"><b>WARNING:</b> This option is deprecated and will be removed in a future version of HAProxy, threads should be used instead.</div>]]></help>
         <advanced>true</advanced>
     </field>
     <field>