From 7704eea506cc241f96ae261a033464ec06ed120c Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 14 Feb 2026 21:06:16 +0100 Subject: [PATCH] Recommit for updates in build 54 --- doc/_index.html | 29 +++ doc/puppet_class_list.html | 17 +- .../confdroid_nagios_3A_3Aparams.html | 6 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 160 ++++++++++++++ ...nfdroid_nagios_3A_3Aserver_3A_3Afiles.html | 17 +- ...droid_nagios_3A_3Aserver_3A_3Aservice.html | 6 +- doc/puppet_defined_type_list.html | 54 +++++ ...fdroid_nagios_3A_3Aserver_3A_3Aaccess.html | 200 ++++++++++++++++++ 8 files changed, 471 insertions(+), 18 deletions(-) create mode 100644 doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html create mode 100644 doc/puppet_defined_type_list.html create mode 100644 doc/puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html diff --git a/doc/_index.html b/doc/_index.html index 37c1140..fd87216 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -98,6 +98,11 @@ +
  • + confdroid_nagios::server::access_rules + +
    • +
  • confdroid_nagios::server::files @@ -122,6 +127,30 @@ +

    Defined Type Listing A-Z

    + + + + + + +
    + + + + +
    + diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 222ba19..8379b72 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -28,6 +28,10 @@ Puppet Classes + + Defined Types + + @@ -78,21 +82,28 @@
    • -
  • +
  • +
    + confdroid_nagios::server::access_rules +
    +
    • + + +
  • confdroid_nagios::server::files
    • -
  • +
  • confdroid_nagios::server::nagios
    • -
  • +
  • confdroid_nagios::server::service
    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 5149f07..c7c4497 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -81,6 +81,8 @@ confdroid_nagios::server::service
    + confdroid_nagios::server::access_rules
    + @@ -415,7 +417,8 @@ inherited by all classes except defines. 134 135 136 -137 +137 +138 
    # File 'manifests/params.pp', line 32
@@ -432,6 +435,7 @@ class confdroid_nagios::params (
 # httpd
   Boolean $ng_use_https       = false,
 
+
 ) {
 # Default facts
   $fqdn                     = $facts['networking']['fqdn']
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html
new file mode 100644
index 0000000..bf98acb
--- /dev/null
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -0,0 +1,160 @@
+
+
+  
+    
+
+
+  Puppet Class: confdroid_nagios::server::access_rules
+  
+    — Documentation by YARD 0.9.36
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: confdroid_nagios::server::access_rules
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    confdroid_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/server/access_rules.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages presence of /etc/nagios/passwd file.
+
+
    Overview
    
+
    
+  
    
+    
+
    confdroid_nagios::server::access_rules.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)
    
+
+  
    
+
    
+
+
+
+
    
+  
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
    
+          		
+        
    # File 'manifests/server/access_rules.pp', line 6
+
+class confdroid_nagios::server::access_rules (
+
+) inherits confdroid_nagios::params {
+  if $fqdn == $ng_nagios_server {
+    # manage /etc/nagios/passwd file
+
+    concat { $ng_htpasswd_file:
+      ensure   => present,
+      path     => $ng_htpasswd_file,
+      owner    => 'root',
+      group    => 'apache',
+      mode     => '0640',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_etc_t,
+      seluser  => system_u,
+      notify   => Service[$ng_nagios_service],
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 330fea9..68d9a25 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
@@ -76,15 +76,10 @@
   
 
 
-  
    Summary
    
-  Class manages configuration files for the confdroid_nagios module.
-
 
    Overview
    
 
    
   
    
     
-
    confdroid_nagios::server::files.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)
    
-
   
    
 
    
 
@@ -101,6 +96,10 @@
         
     
 
+2
+3
+4
+5
 6
 7
 8
@@ -111,14 +110,10 @@
 13
 14
 15
-16
-17
-18
-19
-20
    
+16
    - 
    # File 'manifests/server/files.pp', line 6
+        
    # File 'manifests/server/files.pp', line 2
 
 class confdroid_nagios::server::files (
 
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 5b4e5d4..5e737cf 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
@@ -131,8 +131,8 @@ class confdroid_nagios::server::service (
 ) inherits confdroid_nagios::params {
   require confdroid_nagios::server::files
   if $ng_nagios_server == $fqdn {
-    exec { 'restart_httpd':
-      command     => 'systemctl restart httpd',
+    exec { 'reload_httpd':
+      command     => 'systemctl reload httpd',
       path        => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
       refreshonly => true,
     }
@@ -143,7 +143,7 @@ class confdroid_nagios::server::service (
       enable     => true,
       hasrestart => true,
       hasstatus  => true,
-      require    => Exec['restart_httpd'],
+      require    => Exec['reload_httpd'],
     }
   }
 }
    
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
new file mode 100644
index 0000000..cffa239
--- /dev/null
+++ b/doc/puppet_defined_type_list.html
@@ -0,0 +1,54 @@
+
+
+  
+    
+    
+    
+      
+    
+      
+    
+
+    
+      
+    
+      
+    
+
+    Defined Type List
+    
+  
+  
+    
    
+      
    
+        
    Defined Type List
    
+        
+
+        
+      
    
+
+      
+    
    
+  
+
diff --git a/doc/puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html
new file mode 100644
index 0000000..5a1508a
--- /dev/null
+++ b/doc/puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -0,0 +1,200 @@
+
+
+  
+    
+
+
+  Defined Type: confdroid_nagios::server::access
+  
+    — Documentation by YARD 0.9.36
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Defined Type: confdroid_nagios::server::access
    
+
    
+  
    
+    
    Defined in:
    
+    
    
+      manifests/server/access.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages access configuration for the confdroid_nagios module.
+
+
    Overview
    
+
    
+  
    
+    
+
    confdroid_nagios::server::access.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)
    
+
+  
    
+
    
+
+
+
+
    
+  
+  
    
+    
    Examples:
    
+    
+      
+      
    confdroid_nagios::server::access { 'example':
+  ng_htpasswd_user     => 'example_user',
+  ng_htpasswd_password => 'example_password_encrypted',
+}
    
+    
+  
    
+
    Parameters:
    
+
      
+  
+    
    • 
+      
+        ng_htpasswd_user
+      
+      
+        (Optional[String])
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
      
+
      The username for the Nagios web interface.
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_htpasswd_password
+      
+      
+        (Optional[String])
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
      
+
      The encrypted password for the Nagios web interface.
      
+
      
+      
+    
      • 
+  
+
    
+
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
    
+          		
+        
    # File 'manifests/server/access.pp', line 13
+
+define confdroid_nagios::server::access (
+  Optional[String] $ng_htpasswd_user     = undef,
+  Optional[String] $ng_htpasswd_password = undef,
+) {
+  $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
+  $ng_htpasswd_file = $confdroid_nagios::params::ng_htpasswd_file
+  $ng_htpasswd_rule = $confdroid_nagios::params::ng_htpasswd_rule
+  $ng_service       = $confdroid_nagios::params::ng_nagios_service
+
+  if $fqdn == $ng_nagios_server {
+    # create password rules
+
+    concat::fragment { $name:
+      target  => $ng_htpasswd_file,
+      content => template($ng_htpasswd_rule),
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file