diff --git a/doc/file.README.html b/doc/file.README.html index 346baea..be632c6 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -110,9 +110,11 @@
  • 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

    +
  • +

    configures the main nagios configuration file and sets values as (pre)configured per values in params, which can be overwritten.

    +
  • +

    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

    diff --git a/doc/index.html b/doc/index.html index a9f8a41..9aff812 100644 --- a/doc/index.html +++ b/doc/index.html @@ -110,9 +110,11 @@
  • 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

    +
  • +

    configures the main nagios configuration file and sets values as (pre)configured per values in params, which can be overwritten.

    +
  • +

    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

    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 16fe139..1e5cbbc 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html @@ -476,7 +476,7 @@ class confdroid_nagios::main::dirs ( path => $ng_run_dir, owner => 'nagios', group => 'nagios', - mode => '0750', + mode => '0755', selrange => s0, selrole => object_r, seltype => nagios_var_run_t, @@ -489,7 +489,7 @@ class confdroid_nagios::main::dirs ( path => $ng_cmd_dir, owner => 'nagios', group => 'nagios', - mode => '0775', + mode => '2775', selrange => s0, selrole => object_r, seltype => nagios_spool_t, @@ -502,7 +502,7 @@ class confdroid_nagios::main::dirs ( path => $ng_checkresults_dir, owner => 'nagios', group => 'nagios', - mode => '0770', + mode => '0750', selrange => s0, selrole => object_r, seltype => nagios_spool_t, diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 0373d7c..8abb7dd 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -271,6 +271,24 @@ inherited by all classes except defines. —

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

    +
    + + + +
  • + + ng_log_file + + + (String) + + + (defaults to: '/var/log/nagios/nagios.log') + + + — +
    +

    The path to the Nagios log file. Default is ‘/var/log/nagios/nagios.log’.

  • @@ -286,8 +304,6 @@ inherited by all classes except defines.
     
     
    -29
    -30
     31
     32
     33
    @@ -396,10 +412,15 @@ inherited by all classes except defines.
     136
     137
     138
    -139
    +139 +140 +141 +142 +143 +144 -
    # File 'manifests/params.pp', line 29
    +        
    # File 'manifests/params.pp', line 31
     
     class confdroid_nagios::params (
     
    @@ -412,7 +433,10 @@ class confdroid_nagios::params (
       String $ng_main_user              = 'nagios',
       String $ng_main_password          = 'nagios',
     
    -# cgi
    +# nagios.cfg
    +  String $ng_log_file              = '/var/log/nagios/nagios.log',
    +
    +# cgi.cfg
       String $ng_context_help           = '1',
     
     # httpd