diff --git a/net/haproxy/pkg-descr b/net/haproxy/pkg-descr index 4da288475..6ea53de08 100644 --- a/net/haproxy/pkg-descr +++ b/net/haproxy/pkg-descr @@ -15,11 +15,12 @@ Changed: * upgrade to HAProxy 2.6 release series (#3026) * rename frontend option "Type" to "Connection Mode" (#3026) * migrate options "http-tunnel" and "forceclose" to "http-keep-alive" (#3026) +* replace "process" with "threads" bind keyword for CPU Affinity (#3026) Removed: * remove Processes/nbproc option (use Threads/nbthread instead) (#3026) * remove "Process ID" from CPU Affinity settings (now always 1) (#3026) -* remove "bind-process" option (replaced by the "process" bind keyword) (#3026) +* remove "bind-process" option (replaced by the "threads" bind keyword) (#3026) * remove options "http-tunnel" and "forceclose" from "Connection Mode" (#3026) 3.12 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 c4799282f..f465e6bf5 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf @@ -1379,7 +1379,7 @@ frontend {{frontend.name}} {% set cpu_map_data = helpers.getUUID(cpu_map) %} {% if cpu_map_data.enabled == '1' %} {# # 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', '')) %} +{% do adv_options.append('thread ' ~ cpu_map_data.thread_id|replace('x', '')) %} {% endif %} {% endfor %} {% endif %}