From fe5553494362171556931861c7ace3c2f6505190 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 21 Feb 2026 13:45:51 +0100 Subject: [PATCH] Recommit for updates in build 68 --- doc/file.README.html | 2 ++ doc/index.html | 2 ++ .../confdroid_nagios_3A_3Aparams.html | 32 ++++++++++++++++--- ...nfdroid_nagios_3A_3Aserver_3A_3Afiles.html | 20 ++++++------ 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index 279b121..346baea 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -111,6 +111,8 @@

an additional directory /etc/nagios/conf.d is created to place the custom checks etc. without being overwritten by updates.

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

    +
  • +

    configures all required directories for server and clients and sets proper permissions and selinux contexts

  • configuring user access

    diff --git a/doc/index.html b/doc/index.html index 6b6a85f..a9f8a41 100644 --- a/doc/index.html +++ b/doc/index.html @@ -111,6 +111,8 @@

    an additional directory /etc/nagios/conf.d is created to place the custom checks etc. without being overwritten by updates.

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

    +
  • +

    configures all required directories for server and clients and sets proper permissions and selinux contexts

  • configuring user access

    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index c62594a..0373d7c 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -253,6 +253,24 @@ inherited by all classes except defines. —

    The encrypted password for the Nagios web interface. Default is ‘nagios’. Must be properly encrypted using the htpasswd utility.

    +
    + + + +
  • + + ng_context_help + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to enable the context help in the Nagios web interface. Default is ‘1’.

  • @@ -268,8 +286,6 @@ inherited by all classes except defines.
     
     
    -27
    -28
     29
     30
     31
    @@ -375,10 +391,15 @@ inherited by all classes except defines.
     131
     132
     133
    -134
    +134 +135 +136 +137 +138 +139 -
    # File 'manifests/params.pp', line 27
    +        
    # File 'manifests/params.pp', line 29
     
     class confdroid_nagios::params (
     
    @@ -391,6 +412,9 @@ class confdroid_nagios::params (
       String $ng_main_user              = 'nagios',
       String $ng_main_password          = 'nagios',
     
    +# cgi
    +  String $ng_context_help           = '1',
    +
     # httpd
       Boolean $ng_use_https       = false,
     
    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 81067f7..f4b96a1 100644
    --- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
    +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
    @@ -124,16 +124,16 @@ class confdroid_nagios::server::files (
     
     ) inherits confdroid_nagios::params {
       require confdroid_nagios::main::dirs
    -#  if $ng_nagios_server == $fqdn {
    -#    file { $ng_nagios_cfg_file:
    -#      ensure  => file,
    -#      owner   => 'nagios',
    -#      group   => 'nagios',
    -#      mode    => '0644',
    -#      content => template($ng_nagios_cfg_erb),
    -#      notify  => Service[$ng_nagios_service],
    -#    }
    -#  }
    +  if $ng_nagios_server == $fqdn {
    +    file { $ng_nagios_cfg_file:
    +      ensure  => file,
    +      owner   => 'nagios',
    +      group   => 'nagios',
    +      mode    => '0644',
    +      content => template($ng_nagios_cfg_erb),
    +      notify  => Service[$ng_nagios_service],
    +    }
    +  }
     }