diff --git a/doc/file.README.html b/doc/file.README.html index 88f28ee..f2ebc2d 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -69,6 +69,9 @@

WARNING

  • Features

    +

  • Repo Documentation

  • @@ -106,6 +109,10 @@

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

    • +

    configuring user access

    + +

    ToDo

    +

    Repo Documentation

    See the full Puppet documentation including parameters in docs/index.html

    diff --git a/doc/index.html b/doc/index.html index 7e3e41e..04d68dc 100644 --- a/doc/index.html +++ b/doc/index.html @@ -69,6 +69,9 @@

    WARNING

  • Features

    +

  • Repo Documentation

  • @@ -106,6 +109,10 @@

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

    • +

    configuring user access

    + +

    ToDo

    +

    Repo Documentation

    See the full Puppet documentation including parameters in docs/index.html

    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index c7c4497..bf8c075 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -297,6 +297,42 @@ inherited by all classes except defines. —

    Whether to configure the Nagios web interface to use HTTPS. Default is false. We recommend using a reverse proxy with SSL termination in front of the Nagios web interface, so this is disabled by default.

    +
    + + + +
  • + + ng_main_user + + + (String) + + + (defaults to: 'nagios') + + + — +
    +

    The username for the Nagios web interface. Default is ‘nagios’.

    +
    + +
    • + +
  • + + ng_main_password + + + (String) + + + (defaults to: 'nagios') + + + — +
    +

    The encrypted password for the Nagios web interface. Default is ‘nagios’.

    • @@ -312,10 +348,6 @@ inherited by all classes except defines. 
     
 
-32
-33
-34
-35
 36
 37
 38
@@ -418,10 +450,16 @@ inherited by all classes except defines.
 135
 136
 137
-138
    +138 +139 +140 +141 +142 +143 +144 - 
    # File 'manifests/params.pp', line 32
+        
    # File 'manifests/params.pp', line 36
 
 class confdroid_nagios::params (
 
@@ -431,6 +469,8 @@ class confdroid_nagios::params (
   Array $ng_reqpackages_client      = ['net-snmp-utils','nagios-plugins','nagios-plugins-all','nagios-plugins-nrpe','nagios-common'],
   String $ng_pkg_ensure             = 'present',
   Boolean $ng_include_nrpe          = true,
+  String $ng_main_user              = 'nagios',
+  String $ng_main_password          = 'nagios',
 
 # httpd
   Boolean $ng_use_https       = false,
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
index bf98acb..2639db5 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -120,7 +120,14 @@
 22
 23
 24
-25
    
+25
+26
+27
+28
+29
+30
+31
+32
    # File 'manifests/server/access_rules.pp', line 6
@@ -143,6 +150,13 @@ class confdroid_nagios::server::access_rules (
       seluser  => system_u,
       notify   => Service[$ng_nagios_service],
     }
+
+    # manage file header
+    concat::fragment { 'fle_header':
+      target  => $ng_htpasswd_file,
+      content => template($ng_htpasswd_head),
+      order   => '000',
+    }
   }
 }
    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 68d9a25..330fea9 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html @@ -76,10 +76,15 @@ +

    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)

    +
    @@ -96,10 +101,6 @@ 
     
 
-2
-3
-4
-5
 6
 7
 8
@@ -110,10 +111,14 @@
 13
 14
 15
-16
    +16 +17 +18 +19 +20 - 
    # File 'manifests/server/files.pp', line 2
+        
    # File 'manifests/server/files.pp', line 6
 
 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 5e737cf..9a5e1bb 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
@@ -121,7 +121,8 @@
 23
 24
 25
-26
    
+26
+27
    # File 'manifests/server/service.pp', line 6
@@ -131,6 +132,7 @@ class confdroid_nagios::server::service (
 ) inherits confdroid_nagios::params {
   require confdroid_nagios::server::files
   if $ng_nagios_server == $fqdn {
+    require confdroid_nagios::server::access_rules
     exec { 'reload_httpd':
       command     => 'systemctl reload httpd',
       path        => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],