diff --git a/net/haproxy/pkg-descr b/net/haproxy/pkg-descr
index 2333e2ed1..b3867d3e2 100644
--- a/net/haproxy/pkg-descr
+++ b/net/haproxy/pkg-descr
@@ -9,6 +9,11 @@ Plugin Changelog
Changed:
* update URLs to HAProxy 2.6 documentation
+Removed:
+* remove Processes/nbproc option (use Threads/nbthread instead)
+* remove "Process ID" from CPU Affinity settings (now always 1)
+* remove "bind-process" option (replaced by the "process" bind keyword)
+
3.12
Added:
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php
index 4e0006f39..4231ca119 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php
@@ -343,7 +343,7 @@ class SettingsController extends ApiMutableModelControllerBase
public function searchCpusAction()
{
- return $this->searchBase('cpus.cpu', array('enabled', 'name', 'process_id', 'thread_id', 'cpu_id'), 'name');
+ return $this->searchBase('cpus.cpu', array('enabled', 'name', 'thread_id', 'cpu_id'), 'name');
}
public function getGroupAction($uuid = null)
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogCpu.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogCpu.xml
index a1d97f46e..8e0b70596 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogCpu.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogCpu.xml
@@ -11,12 +11,6 @@
textChoose a name for this CPU affinity rule.
-
- cpu.process_id
-
- dropdown
- Process ID that should bind to a specific CPU set. Any process IDs above nbproc are ignored.
- cpu.thread_id
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 807087cce..0bef8a78b 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
@@ -10,13 +10,6 @@
NOTE: Running as user root could be a security issue but it may be required by some features.
]]>true
-
- haproxy.general.tuning.nbproc
-
- text
-
WARNING: This option is deprecated and will be removed in a future version of HAProxy, threads should be used instead.
]]>
- true
- haproxy.general.tuning.nbthread
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 8289391d5..a4920acc2 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
@@ -72,13 +72,6 @@
Please specify a value between 0 and 10000000.N
-
- 1
- 1
- 128
- Please specify a value between 1 and 128.
- Y
- 11
@@ -2712,77 +2705,6 @@
Should be a string between 1 and 255 characters.Y
-
- Y
-
- All HAProxy processes
- Processes with odd ID
- Processes with even ID
- Process 1
- Process 2
- Process 3
- Process 4
- Process 5
- Process 6
- Process 7
- Process 8
- Process 9
- Process 10
- Process 11
- Process 12
- Process 13
- Process 14
- Process 15
- Process 16
- Process 17
- Process 18
- Process 19
- Process 20
- Process 21
- Process 22
- Process 23
- Process 24
- Process 25
- Process 26
- Process 27
- Process 28
- Process 29
- Process 30
- Process 31
- Process 32
- Process 33
- Process 34
- Process 35
- Process 36
- Process 37
- Process 38
- Process 39
- Process 40
- Process 41
- Process 42
- Process 43
- Process 44
- Process 45
- Process 46
- Process 47
- Process 48
- Process 49
- Process 50
- Process 51
- Process 52
- Process 53
- Process 54
- Process 55
- Process 56
- Process 57
- Process 58
- Process 59
- Process 60
- Process 61
- Process 62
- Process 63
-
- Y
diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
index ee36d6a4a..54dd719be 100644
--- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
+++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
@@ -1131,7 +1131,6 @@ POSSIBILITY OF SUCH DAMAGE.
{{ lang._('CPU Rule ID') }}
{{ lang._('Enabled') }}
{{ lang._('Name') }}
-
{{ lang._('Process ID') }}
{{ lang._('Thread ID') }}
{{ lang._('CPU ID') }}
{{ lang._('Commands') }}
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index e0fb1fd7a..418a16c1e 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -960,14 +960,13 @@ global
{% else %}
stats socket /var/run/haproxy.socket group proxy mode 775 level admin
{% endif %}
- nbproc {{OPNsense.HAProxy.general.tuning.nbproc}}
{% if OPNsense.HAProxy.general.tuning.nbthread|default('') != '' %}
nbthread {{OPNsense.HAProxy.general.tuning.nbthread}}
{% endif %}
{% if helpers.exists('OPNsense.HAProxy.cpus.cpu') %}
{% for cpu_map in helpers.toList('OPNsense.HAProxy.cpus.cpu') %}
{% if cpu_map.enabled == '1' %}
- cpu-map {{cpu_map.process_id|replace('x', '')}}/{{cpu_map.thread_id|replace('x', '')}} {{cpu_map.cpu_id|replace('x', '')|replace(',', ' ')}}
+ cpu-map 1/{{cpu_map.thread_id|replace('x', '')}} {{cpu_map.cpu_id|replace('x', '')|replace(',', ' ')}}
{% endif %}
{% endfor %}
{% endif %}
@@ -1372,20 +1371,14 @@ frontend {{frontend.name}}
{% do adv_options.append('proto h2') %}
{% endif %}
{# # CPU affinity configuration #}
-{% set bind_process = [] %}
{% if frontend.linkedCpuAffinityRules|default('') != '' %}
{% for cpu_map in frontend.linkedCpuAffinityRules.split(',') %}
{% set cpu_map_data = helpers.getUUID(cpu_map) %}
{% if cpu_map_data.enabled == '1' %}
-{# # Limit visibility to a certain set of processes #}
-{% do bind_process.append(cpu_map_data.process_id|replace('x', '')) %}
-{# # Restrict the list of processes/threads on which this listener is allowed to run #}
-{% do adv_options.append('process ' ~ cpu_map_data.process_id|replace('x', '') ~ '/' ~ cpu_map_data.thread_id|replace('x', '')) %}
+{# # Restrict the list of threads on which this listener is allowed to run #}
+{% do adv_options.append('process ' ~ '1/' ~ cpu_map_data.thread_id|replace('x', '')) %}
{% endif %}
{% endfor %}
-{% if bind_process|length > 0 %}
- bind-process {{bind_process|join(' ')}}
-{% endif %}
{% endif %}
{# # bind/listen configuration #}
{% if frontend.bind|default("") != "" %}