From 21cfd498cceb819be5ded37d2871877723ef5609 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 14 Mar 2026 13:21:20 +0100 Subject: [PATCH] Recommit for updates in build 235 --- doc/file.README.html | 2 - doc/index.html | 2 - .../confdroid_nagios_3A_3Aparams.html | 54 +++---------------- ...nfdroid_nagios_3A_3Aserver_3A_3Afiles.html | 32 +---------- 4 files changed, 7 insertions(+), 83 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index fc11244..526b481 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -143,8 +143,6 @@

if ng_include_nrpeis set to true, the confdroid_nrpe module is automatically applied on clients (confdroid_nrpe must be in the catalogue then)

  • if ng_enable_fail2banis set to true, a fail2ban jail and filter will be added for the Nagios service (requires confdroid_fail2ban).

    -
  • -

    manage remoteIP logging if running behind a Loadbalancer like HAproxy: if ng_use_lb is set to true, a configuration file etc/httpd/conf.d/loadbalancer-remoteip.confis created and configures apache/httpd to use the remote header. This allows proper fail2ban protection even behind the Loadbalancer. Make sure to set ng_trusted_proxyto the proper IP or range for the loadbalancer!

    • Repo Documentation

    diff --git a/doc/index.html b/doc/index.html index 020ca9b..6618dd5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -143,8 +143,6 @@

    if ng_include_nrpeis set to true, the confdroid_nrpe module is automatically applied on clients (confdroid_nrpe must be in the catalogue then)

  • if ng_enable_fail2banis set to true, a fail2ban jail and filter will be added for the Nagios service (requires confdroid_fail2ban).

    -
  • -

    manage remoteIP logging if running behind a Loadbalancer like HAproxy: if ng_use_lb is set to true, a configuration file etc/httpd/conf.d/loadbalancer-remoteip.confis created and configures apache/httpd to use the remote header. This allows proper fail2ban protection even behind the Loadbalancer. Make sure to set ng_trusted_proxyto the proper IP or range for the loadbalancer!

    • Repo Documentation

    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 3bc11c2..7ebcaee 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -4075,42 +4075,6 @@ inherited by all classes except defines. -
  • - - ng_use_lb - - - (Boolean) - - - (defaults to: false) - - - — -
    -

    Whether to use load balancing for the Nagios server. Default is false.

    -
    - -
    • - -
  • - - ng_trusted_proxy - - - (String) - - - (defaults to: '10.0.0.10') - - - — -
    -

    The IP address of the trusted proxy to access the Nagios server. Default is ‘10.0.0.10’.

    -
    - -
    • -
  • ng_use_ssl_auth @@ -4135,6 +4099,10 @@ inherited by all classes except defines. 
     
 
+445
+446
+447
+448
 449
 450
 451
@@ -4475,17 +4443,10 @@ inherited by all classes except defines.
 786
 787
 788
-789
-790
-791
-792
-793
-794
-795
-796
    +789 - 
    # File 'manifests/params.pp', line 449
+        
    # File 'manifests/params.pp', line 445
 
 class confdroid_nagios::params (
 
@@ -4503,8 +4464,6 @@ class confdroid_nagios::params (
   String $ng_user                       = 'nagios',
   Boolean $ng_enable_target             = true,
   Boolean $ng_purge_target              = true,
-  Boolean $ng_use_lb                    = false,
-  String $ng_trusted_proxy              = '10.0.0.10',
 
 # contact groups
   String $ng_contactgroup_name          = 'admins',
@@ -4775,7 +4734,6 @@ class confdroid_nagios::params (
   $ng_nagios_cfg_erb          = 'confdroid_nagios/nagios/nagios_cfg.erb'
   $ng_cgi_cfg_file            = "${ng_main_dir}/cgi.cfg"
   $ng_cgi_cfg_erb             = 'confdroid_nagios/nagios/cgi_cfg.erb'
-  $ng_remoteip_file           = '/etc/httpd/conf.d/loadbalancer-remoteip.conf'
 
 # nagios
   $ng_target_templates        = "${ng_conf_d_dir}/nagios_templates.cfg"
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
index f0c0a80..a1d7cf2 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
@@ -143,22 +143,7 @@
 45
 46
 47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
    
+48
    # File 'manifests/server/files.pp', line 6
@@ -204,21 +189,6 @@ class confdroid_nagios::server::files (
       seltype  => nagios_var_run_t,
       seluser  => system_u,
     }
-
-    if $ng_use_lb == true {
-      file { $ng_remoteip_file:
-        ensure   => file,
-        owner    => 'root',
-        group    => 'root',
-        mode     => '0644',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => httpd_conf_t,
-        seluser  => system_u,
-        content  => template('confdroid_nagios/loadbalancer/remoteip.conf.erb'),
-        notify   => Service['httpd'],
-      }
-    }
   }
 }