From fb63348dae65be10e3c7b5cbe7942b6404238305 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 11 Feb 2026 17:47:38 +0100 Subject: [PATCH] Recommit for updates in build 7 --- doc/_index.html | 5 + doc/puppet_class_list.html | 11 +- ...fdroid_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...onfdroid_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../confdroid_nagios_3A_3Amain_3A_3Adirs.html | 2 +- ...nfdroid_nagios_3A_3Amain_3A_3Ainstall.html | 4 +- .../confdroid_nagios_3A_3Amain_3A_3Auser.html | 2 +- .../confdroid_nagios_3A_3Aparams.html | 108 ++++++++++++++++-- ...nfdroid_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- ...droid_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- 10 files changed, 120 insertions(+), 20 deletions(-) diff --git a/doc/_index.html b/doc/_index.html index e1f88fb..1246ffa 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -98,6 +98,11 @@ +
  • + confdroid_nagios::params + +
    • +
  • confdroid_nagios::server::files diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 5ec58f1..178ce50 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -78,14 +78,21 @@
    • -
  • +
  • +
    + confdroid_nagios::params +
    +
    • + + +
  • confdroid_nagios::server::files
    • -
  • +
  • confdroid_nagios::server::service
    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html index bca30f0..cb65474 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_nagios::params
    +
    confdroid_nagios::params
    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html index 3572dce..dc1dce8 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_nagios::params
    +
    confdroid_nagios::params
    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html index 46695a7..b332abd 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_nagios::params
    +
    confdroid_nagios::params
    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html index e2806c9..c966da6 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_nagios::params
    +
    confdroid_nagios::params
    @@ -77,7 +77,7 @@

    Summary

    - Class manages main configuration for the confdroid_nagios module. + Class manages installation matters for the confdroid_nagios module.

    Overview

    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Auser.html index 5acf94f..733de7b 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Auser.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_nagios::params
    +
    confdroid_nagios::params
    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 8875e82..2d15c4e 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -125,6 +125,60 @@ inherited by all classes except defines. —

    The hostname or IP address of the Nagios server. This will determine the installation selection and the of the clients to connect to the Nagios server.

    +
    + +
    • + +
  • + + ng_reqpackages_server + + + (Array) + + + (defaults to: ['nagios','nagios-devel']) + + + — +
    +

    An array of packages to be installed on the Nagios server.

    +
    + +
    • + +
  • + + ng_reqpackages_client + + + (Array) + + + (defaults to: ['net-snmp-utils','nagios-plugins','nagios-plugins-all','nagios-plugins-nrpe','nagios-common']) + + + — +
    +

    An array of packages to be installed on the Nagios clients.

    +
    + +
    • + +
  • + + ng_pkg_ensure + + + (String) + + + (defaults to: 'present') + + + — +
    +

    The ensure value for all packages. Default is ‘present’.

    • @@ -140,12 +194,6 @@ inherited by all classes except defines. 
     
 
-10
-11
-12
-13
-14
-15
 16
 17
 18
@@ -155,16 +203,41 @@ inherited by all classes except defines.
 22
 23
 24
-25
    +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 - 
    # File 'manifests/params.pp', line 10
+        
    # File 'manifests/params.pp', line 16
 
 class confdroid_nagios::params (
 
 # main
-  String $ng_nagios_server = 'nagios.example.net',
-
+  String $ng_nagios_server     = 'nagios.example.net',
+  Array $ng_reqpackages_server = ['nagios','nagios-devel'],
+  Array $ng_reqpackages_client = ['net-snmp-utils','nagios-plugins','nagios-plugins-all','nagios-plugins-nrpe','nagios-common'],
+  String $ng_pkg_ensure        = 'present',
 
 ) {
 # Default facts
@@ -173,6 +246,21 @@ class confdroid_nagios::params (
   $os_name                  = $facts['os']['name']
   $os_release               = $facts['os']['release']['major']
 
+# service
+  $ng_service                 = 'nagios'
+  $ae_service                 = 'httpd'
+
+# directories
+  $ng_main_dir                = '/etc/nagios'
+  $ng_conf_d_dir              = "${ng_main_dir}/conf.d"
+  $ng_objects_dir             = "${ng_main_dir}/objects"
+  $ng_private_dir             = "${ng_main_dir}/private"
+  $ng_usr_incl                = '/usr/include/nagios'
+  $ng_lib_dir                 = '/usr/lib64/nagios'
+  $ng_log_dir                 = '/var/log/nagios'
+  $ng_log_archives            = "${ng_log_dir}/archives"
+  $ng_spool_dir               = '/var/spool/nagios'
+
 # includes must be last
   include confdroid_nagios::main::config
 }
    
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 70ddf83..0bf930a 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    confdroid_nagios::params
    
+    
    confdroid_nagios::params
    
   
    
   
   
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
index 09f9044..51410e9 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    confdroid_nagios::params
    
+    
    confdroid_nagios::params