feat(haproxy): sync update

Author: Maxime Wewer

docs/source/modules/haproxy.rst

@@ -345,6 +345,8 @@ Core load balancing setup with backends, frontends, servers, and health checks:
 
 ----
 
+.. _modules_haproxy_troubleshooting:
+
 Troubleshooting
 ***************
 
@@ -371,4 +373,4 @@ For high-traffic scenarios:
 - Increase ``buffer_size`` for large requests/responses
 - Adjust ``timeout_*`` values based on your application needs
 
-See: :ref:`troubleshooting <troubleshooting>`
+See: :ref:`troubleshooting <modules_haproxy_troubleshooting>`

docs/source/modules/haproxy_advanced.rst

@@ -147,4 +147,4 @@ Examples
           </html>
 
 
-See also: :ref:`modules_haproxy` and :ref:`troubleshooting <troubleshooting>`
+See also: :ref:`modules_haproxy` and :ref:`troubleshooting <modules_haproxy_troubleshooting>`

docs/source/modules/haproxy_auth.rst

@@ -2,9 +2,9 @@
 
 .. include:: ../_include/head.rst
 
-============================
+==============================
 HAProxy authentication modules
-============================
+==============================
 
 **STATE**: unstable
 
@@ -23,7 +23,7 @@ These modules manage HAProxy authentication users and groups for access control.
 .. _haproxy_user:
 
 oxlorg.opnsense.haproxy_user
-=================================
+============================
 
 Manages HAProxy authentication users.
 
@@ -53,7 +53,7 @@ Examples
 .. _haproxy_group:
 
 oxlorg.opnsense.haproxy_group
-===================================
+=============================
 
 Manages HAProxy authentication groups.
 
@@ -80,4 +80,4 @@ Examples
         enabled: true
 
 
-See also: :ref:`modules_haproxy` and :ref:`troubleshooting <troubleshooting>`
+See also: :ref:`modules_haproxy` and :ref:`troubleshooting <modules_haproxy_troubleshooting>`

docs/source/modules/haproxy_core.rst

@@ -2,9 +2,9 @@
 
 .. include:: ../_include/head.rst
 
-=====================================
+===================================
 HAProxy core load balancing modules
-=====================================
+===================================
 
 **STATE**: unstable
 
@@ -25,7 +25,7 @@ These modules manage the core HAProxy load balancing functionality including bac
 .. _haproxy_backend:
 
 oxlorg.opnsense.haproxy_backend
-====================================
+===============================
 
 Manages HAProxy backend pools with servers, load balancing algorithms, health checks, persistence, and advanced settings.
 
@@ -134,7 +134,7 @@ Examples
 .. _haproxy_frontend:
 
 oxlorg.opnsense.haproxy_frontend
-=====================================
+================================
 
 Manages HAProxy frontend services with SSL offloading, logging, traffic routing, and advanced features.
 
@@ -251,7 +251,7 @@ Examples
 .. _haproxy_server:
 
 oxlorg.opnsense.haproxy_server
-===================================
+==============================
 
 Manages HAProxy backend servers with SSL, health checks, connection settings, and advanced configurations.
 
@@ -325,7 +325,7 @@ Examples
 .. _haproxy_healthcheck:
 
 oxlorg.opnsense.haproxy_healthcheck
-========================================
+===================================
 
 Manages HAProxy health monitoring for servers with various check types including HTTP, TCP, and specialized protocols.
 
@@ -399,4 +399,6 @@ Examples
         type: 'mysql'
         mysql_user: 'healthcheck'
         mysql_post41: true
-        interval: '10s'
+        interval: '10s'
+
+See also: :ref:`modules_haproxy` and :ref:`troubleshooting <modules_haproxy_troubleshooting>`

docs/source/modules/haproxy_general.rst

@@ -28,7 +28,7 @@ These modules manage the general HAProxy configuration including settings, stati
 .. _haproxy_general_settings:
 
 oxlorg.opnsense.haproxy_general_settings
-==============================================
+========================================
 
 Manages the basic operational settings for HAProxy.
 
@@ -60,7 +60,7 @@ Examples
 .. _haproxy_general_stats:
 
 oxlorg.opnsense.haproxy_general_stats
-==========================================
+=====================================
 
 Manages HAProxy statistics and monitoring configuration.
 
@@ -100,7 +100,7 @@ Examples
 .. _haproxy_general_defaults:
 
 oxlorg.opnsense.haproxy_general_defaults
-=============================================
+========================================
 
 Manages HAProxy default connection and timeout settings.
 
@@ -137,7 +137,7 @@ Examples
 .. _haproxy_general_tuning:
 
 oxlorg.opnsense.haproxy_general_tuning
-===========================================
+======================================
 
 Manages HAProxy performance tuning and advanced configuration.
 
@@ -190,7 +190,7 @@ Examples
 .. _haproxy_general_logging:
 
 oxlorg.opnsense.haproxy_general_logging
-============================================
+=======================================
 
 Manages HAProxy logging configuration.
 
@@ -220,7 +220,7 @@ Examples
 .. _haproxy_general_peers:
 
 oxlorg.opnsense.haproxy_general_peers
-==========================================
+=====================================
 
 Manages HAProxy peer synchronization for high availability.
 
@@ -256,7 +256,7 @@ Examples
 .. _haproxy_general_cache:
 
 oxlorg.opnsense.haproxy_general_cache
-==========================================
+=====================================
 
 Manages HAProxy caching configuration.
 
@@ -285,4 +285,4 @@ Examples
         max_secondary_entries: 20
 
 
-See also: :ref:`modules_haproxy` and :ref:`troubleshooting <troubleshooting>`
+See also: :ref:`modules_haproxy` and :ref:`troubleshooting <modules_haproxy_troubleshooting>`

docs/source/modules/haproxy_rules.rst

@@ -2,9 +2,9 @@
 
 .. include:: ../_include/head.rst
 
-================================
+===============================
 HAProxy traffic control modules
-================================
+===============================
 
 **STATE**: unstable
 
@@ -23,7 +23,7 @@ These modules manage HAProxy traffic control through ACLs (Access Control Lists)
 .. _haproxy_acl:
 
 oxlorg.opnsense.haproxy_acl
-=================================
+===========================
 
 Manages HAProxy Access Control Lists for traffic filtering and condition matching.
 
@@ -120,7 +120,7 @@ Examples
 .. _haproxy_action:
 
 oxlorg.opnsense.haproxy_action
-====================================
+==============================
 
 Manages HAProxy Actions that execute when ACL conditions are met.
 
@@ -194,4 +194,4 @@ Examples
         type: 'http-request_allow'
 
 
-See also: :ref:`modules_haproxy` and :ref:`troubleshooting <troubleshooting>`
+See also: :ref:`modules_haproxy` and :ref:`troubleshooting <modules_haproxy_troubleshooting>`

docs/source/modules/haproxy_support.rst

@@ -2,9 +2,9 @@
 
 .. include:: ../_include/head.rst
 
-==================================
+========================================
 HAProxy infrastructure & support modules
-==================================
+========================================
 
 **STATE**: unstable
 
@@ -24,7 +24,7 @@ These modules manage HAProxy supporting infrastructure including email notificat
 .. _haproxy_mailer:
 
 oxlorg.opnsense.haproxy_mailer
-==================================
+==============================
 
 Manages HAProxy email notifications for alerts and monitoring.
 
@@ -77,7 +77,7 @@ Examples
 .. _haproxy_mapfile:
 
 oxlorg.opnsense.haproxy_mapfile
-===================================
+===============================
 
 Manages HAProxy map files for dynamic configuration and content routing.
 
@@ -128,7 +128,7 @@ Examples
 .. _haproxy_resolver:
 
 oxlorg.opnsense.haproxy_resolver
-====================================
+================================
 
 Manages HAProxy DNS resolvers for dynamic server resolution and health checking.
 
@@ -209,4 +209,4 @@ Examples
         hold_valid: '15s'
 
 
-See also: :ref:`modules_haproxy` and :ref:`troubleshooting <troubleshooting>`
+See also: :ref:`modules_haproxy` and :ref:`troubleshooting <modules_haproxy_troubleshooting>`

docs/source/modules/haproxy_system.rst

@@ -2,9 +2,9 @@
 
 .. include:: ../_include/head.rst
 
-============================
+====================================
 HAProxy performance & system modules
-============================
+====================================
 
 **STATE**: unstable
 
@@ -23,7 +23,7 @@ These modules manage HAProxy system performance and maintenance settings.
 .. _haproxy_cpu:
 
 oxlorg.opnsense.haproxy_cpu
-=================================
+===========================
 
 Manages CPU affinity rules for HAProxy processes.
 
@@ -54,7 +54,7 @@ Examples
 .. _haproxy_maintenance:
 
 oxlorg.opnsense.haproxy_maintenance
-========================================
+===================================
 
 Manages HAProxy maintenance and monitoring settings.
 
@@ -80,4 +80,4 @@ Examples
 
 **Note**: For general HAProxy configuration like tuning, logging, cache, and other settings, see :ref:`modules_haproxy_general`.
 
-See also: :ref:`modules_haproxy` and :ref:`troubleshooting <troubleshooting>`
+See also: :ref:`modules_haproxy` and :ref:`troubleshooting <modules_haproxy_troubleshooting>`

meta/runtime.yml

@@ -195,12 +195,17 @@ action_groups:
     - oxlorg.opnsense.haproxy_frontend
     - oxlorg.opnsense.haproxy_healthcheck
     - oxlorg.opnsense.haproxy_server
+  wazuh:
+    - oxlorg.opnsense.wazuh_agent
   raw:
     - oxlorg.opnsense.raw
   access:
     - oxlorg.opnsense.user
     - oxlorg.opnsense.group
     - oxlorg.opnsense.privilege
+  nut:
+    - oxlorg.opnsense.nut
+    - oxlorg.opnsense.nut_diagnostics
   all:
     - metadata:
         extend_group:
@@ -227,10 +232,13 @@ action_groups:
           - oxlorg.opnsense.acme
           - oxlorg.opnsense.postfix
           - oxlorg.opnsense.hasync
+          - oxlorg.opnsense.wazuh
           - oxlorg.opnsense.raw
           - oxlorg.opnsense.access
           - oxlorg.opnsense.dnsmasq
           - oxlorg.opnsense.haproxy
+          - oxlorg.opnsense.nut
+          - oxlorg.opnsense.nut_diagnostics
 
 plugin_routing:
   modules:

plugins/module_utils/main/haproxy_acl.py

@@ -2,6 +2,7 @@
 
 from ansible_collections.oxlorg.opnsense.plugins.module_utils.base.api import Session
 from ansible_collections.oxlorg.opnsense.plugins.module_utils.base.cls import BaseModule
+from ansible_collections.oxlorg.opnsense.plugins.module_utils.helper.validate import is_unset
 
 
 class HaproxyAcl(BaseModule):
@@ -101,6 +102,9 @@ def check(self) -> None:
         self._base_check()
 
         if self.p['state'] == 'present':
+            if is_unset(self.p['expression']):
+                self.m.fail_json("You need to provide an 'expression' to create an ACL!")
+
             if self.p.get('allowed_users'):
                 self.b.find_multiple_links(
                     field='allowed_users',
@@ -113,9 +117,9 @@ def check(self) -> None:
                     existing=self.existing_groups,
                     existing_field_id='name',
                 )
-            # if self.p.get('nbsrv_backend'):
-            #     self.b.find_single_link(
-            #         field='nbsrv_backend',
-            #         existing=self.existing_backends,
-            #         existing_field_id='name',
-            #     )
+            if self.p.get('nbsrv_backend'):
+                self.b.find_single_link(
+                    field='nbsrv_backend',
+                    existing=self.existing_backends,
+                    existing_field_id='name',
+                )