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 4305fcb..ee4d248 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html
@@ -289,18 +289,7 @@
191
192
193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
+194
# File 'manifests/main/dirs.pp', line 6
@@ -308,8 +297,48 @@
class confdroid_nagios::main::dirs (
) inherits confdroid_nagios::params {
- require confdroid_nagios::main::user
- if $ng_nagios_server == $fqdn {
+ require cd_nagios::main::user
+
+ # main directory
+ file { $ng_main_dir:
+ ensure => directory,
+ path => $ng_main_dir,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_etc_t,
+ seluser => system_u,
+ }
+
+ # /usr/lib64/nagios dir required for plugins
+ file { $ng_lib_dir:
+ ensure => directory,
+ path => $ng_lib_dir,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ selrange => s0,
+ selrole => object_r,
+ seltype => lib_t,
+ seluser => system_u,
+ }
+
+ # /var/spool/nagios
+ file { $ng_spool_dir:
+ ensure => directory,
+ path => $ng_spool_dir,
+ owner => $ng_user,
+ group => $ng_user,
+ mode => '0755',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_spool_t,
+ seluser => system_u,
+ }
+
+ if $fqdn == $ng_nagios_server {
# /etc/nagios/conf.d
file { $ng_conf_d_dir:
ensure => directory,
@@ -324,7 +353,6 @@ class confdroid_nagios::main::dirs (
}
# /etc/nagios/objects
-
file { $ng_objects_dir:
ensure => directory,
path => $ng_objects_dir,
@@ -338,7 +366,6 @@ class confdroid_nagios::main::dirs (
}
# /etc/nagios/private
-
file { $ng_private_dir:
ensure => directory,
path => $ng_private_dir,
@@ -349,10 +376,9 @@ class confdroid_nagios::main::dirs (
selrole => object_r,
seltype => nagios_etc_t,
seluser => system_u,
- }
+ }
# include dir
-
file { $ng_usr_incl:
ensure => directory,
path => $ng_usr_incl,
@@ -366,7 +392,6 @@ class confdroid_nagios::main::dirs (
}
# log dir
-
file { $ng_log_dir:
ensure => directory,
path => $ng_log_dir,
@@ -380,7 +405,6 @@ class confdroid_nagios::main::dirs (
}
# log archives
-
file { $ng_log_archives:
ensure => directory,
path => $ng_log_archives,
@@ -394,7 +418,6 @@ class confdroid_nagios::main::dirs (
}
# /usr/share/nagios
-
file { $ng_usr_share:
ensure => directory,
path => $ng_usr_share,
@@ -408,7 +431,6 @@ class confdroid_nagios::main::dirs (
}
# /usr/share/nagios/html
-
file { $ng_share_html:
ensure => directory,
path => $ng_share_html,
@@ -422,7 +444,6 @@ class confdroid_nagios::main::dirs (
}
# run dir for pid file
-
file { $ng_run_dir:
ensure => directory,
path => $ng_run_dir,
@@ -436,7 +457,6 @@ class confdroid_nagios::main::dirs (
}
# cmd dir
-
file { $ng_cmd_dir:
ensure => directory,
path => $ng_cmd_dir,
@@ -450,7 +470,6 @@ class confdroid_nagios::main::dirs (
}
# checkresults dir
-
file { $ng_checkresults_dir:
ensure => directory,
path => $ng_checkresults_dir,
@@ -463,47 +482,6 @@ class confdroid_nagios::main::dirs (
seluser => system_u,
}
}
- else {
- file { $ng_main_dir:
- ensure => directory,
- path => $ng_main_dir,
- owner => 'root',
- group => 'root',
- mode => '0755',
- selrange => s0,
- selrole => object_r,
- seltype => nagios_etc_t,
- seluser => system_u,
- }
-
- # /usr/lib64/nagios dir required for plugins
-
- file { $ng_lib_dir:
- ensure => directory,
- path => $ng_lib_dir,
- owner => 'root',
- group => 'root',
- mode => '0755',
- selrange => s0,
- selrole => object_r,
- seltype => lib_t,
- seluser => system_u,
- }
-
- # /var/spool/nagios
-
- file { $ng_spool_dir:
- ensure => directory,
- path => $ng_spool_dir,
- owner => $ng_user,
- group => $ng_user,
- mode => '0755',
- selrange => s0,
- selrole => object_r,
- seltype => nagios_spool_t,
- seluser => system_u,
- }
- }
}
|
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 ef39647..27cbcaa 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html
@@ -129,10 +129,7 @@
31
32
33
-34
-35
-36
-37
+34
# File 'manifests/main/install.pp', line 6
@@ -143,8 +140,7 @@ class confdroid_nagios::main::install (
if $ng_nagios_server == $fqdn {
require confdroid_resources
# if our FQDN matches the configured Nagios server FQDN, install both server-
- # and client packages.
- # we'll need httpd installed
+ # and client packages.We'll need httpd installed
require confdroid_apache
package { $ng_reqpackages_server:
@@ -156,14 +152,12 @@ class confdroid_nagios::main::install (
}
# if we are not the nagios server, install only client packages
-
if $fqdn != $ng_nagios_server {
package { $reqpackages_client:
ensure => $pkg_ensure,
}
- # if we want to use NRPE, install it
-
+ # if we want to use NRPE on clients, install it
if $ng_include_nrpe == true {
require cd_nrpe
}
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 c5a0797..573153a 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Auser.html
@@ -127,8 +127,7 @@
29
30
31
-32
-33
+32
|
# File 'manifests/main/user.pp', line 6
@@ -136,15 +135,14 @@
class confdroid_nagios::main::user (
) inherits confdroid_nagios::params {
+ require confdroid_nagios::main::install
if $ng_nagios_server == $fqdn {
- require confdroid_nagios::main::install
-
group { $ng_user:
- ensure => present,
- name => $ng_user,
- gid => $ng_u_uid,
- allowdupe => false,
- }
+ ensure => present,
+ name => $ng_user,
+ gid => $ng_u_uid,
+ allowdupe => false,
+ }
user { $ng_user:
ensure => present,
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 0bf930a..a4a9742 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
@@ -116,8 +116,8 @@
class confdroid_nagios::server::files (
) inherits confdroid_nagios::params {
+ require confdroid_nagios::main::dirs
if $ng_nagios_server == $fqdn {
- require confdroid_nagios::main::dirs
#config here
}
}
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 51410e9..424743b 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
@@ -116,8 +116,8 @@
class confdroid_nagios::server::service (
) inherits confdroid_nagios::params {
+ require confdroid_nagios::server::files
if $ng_nagios_server == $fqdn {
- require confdroid_nagios::server::files
#config here
}
}
|