From 2da958fe0bc5aaf488f9aa33fdca7f837ab29cfb Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 12 Mar 2026 15:31:34 +0100 Subject: [PATCH] Recommit for updates in build 226 --- .../confdroid_nagios_3A_3Aparams.html | 54 ++++++++++++++++--- ...nfdroid_nagios_3A_3Aserver_3A_3Afiles.html | 32 ++++++++++- 2 files changed, 79 insertions(+), 7 deletions(-) diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 43f1c8f..c387966 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -4075,6 +4075,42 @@ 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 @@ -4099,10 +4135,6 @@ inherited by all classes except defines.
     
     
    -445
    -446
    -447
    -448
     449
     450
     451
    @@ -4443,10 +4475,17 @@ inherited by all classes except defines.
     786
     787
     788
    -789
    +789 +790 +791 +792 +793 +794 +795 +796 -
    # File 'manifests/params.pp', line 445
    +        
    # File 'manifests/params.pp', line 449
     
     class confdroid_nagios::params (
     
    @@ -4464,6 +4503,8 @@ 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',
    @@ -4734,6 +4775,7 @@ 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 a1d7cf2..f0c0a80 100644
    --- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
    +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
    @@ -143,7 +143,22 @@
     45
     46
     47
    -48
    +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63
    # File 'manifests/server/files.pp', line 6
    @@ -189,6 +204,21 @@ 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'],
    +      }
    +    }
       }
     }