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 b332abd..4305fcb 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html
@@ -108,7 +108,199 @@
10
11
12
-13
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
# File 'manifests/main/dirs.pp', line 6
@@ -116,9 +308,201 @@
class confdroid_nagios::main::dirs (
) inherits confdroid_nagios::params {
+ require confdroid_nagios::main::user
if $ng_nagios_server == $fqdn {
- require confdroid_nagios::main::user
- #config here
+ # /etc/nagios/conf.d
+ file { $ng_conf_d_dir:
+ ensure => directory,
+ path => $ng_conf_d_dir,
+ owner => 'root',
+ group => $ng_user,
+ mode => '0750',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_etc_t,
+ seluser => system_u,
+ }
+
+ # /etc/nagios/objects
+
+ file { $ng_objects_dir:
+ ensure => directory,
+ path => $ng_objects_dir,
+ owner => 'root',
+ group => $ng_user,
+ mode => '0750',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_etc_t,
+ seluser => system_u,
+ }
+
+ # /etc/nagios/private
+
+ file { $ng_private_dir:
+ ensure => directory,
+ path => $ng_private_dir,
+ owner => 'root',
+ group => $ng_user,
+ mode => '0750',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_etc_t,
+ seluser => system_u,
+ }
+
+ # include dir
+
+ file { $ng_usr_incl:
+ ensure => directory,
+ path => $ng_usr_incl,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ selrange => s0,
+ selrole => object_r,
+ seltype => usr_t,
+ seluser => system_u,
+ }
+
+ # log dir
+
+ file { $ng_log_dir:
+ ensure => directory,
+ path => $ng_log_dir,
+ owner => $ng_user,
+ group => $ng_user,
+ mode => '0750',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_log_t,
+ seluser => system_u,
+ }
+
+ # log archives
+
+ file { $ng_log_archives:
+ ensure => directory,
+ path => $ng_log_archives,
+ owner => $ng_user,
+ group => $ng_user,
+ mode => '0750',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_log_t,
+ seluser => system_u,
+ }
+
+ # /usr/share/nagios
+
+ file { $ng_usr_share:
+ ensure => directory,
+ path => $ng_usr_share,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ selrange => s0,
+ selrole => object_r,
+ seltype => usr_t,
+ seluser => system_u,
+ }
+
+ # /usr/share/nagios/html
+
+ file { $ng_share_html:
+ ensure => directory,
+ path => $ng_share_html,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ selrange => s0,
+ selrole => object_r,
+ seltype => usr_t,
+ seluser => system_u,
+ }
+
+ # run dir for pid file
+
+ file { $ng_run_dir:
+ ensure => directory,
+ path => $ng_run_dir,
+ owner => 'nagios',
+ group => 'nagios',
+ mode => '0750',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_var_run_t,
+ seluser => system_u,
+ }
+
+ # cmd dir
+
+ file { $ng_cmd_dir:
+ ensure => directory,
+ path => $ng_cmd_dir,
+ owner => 'nagios',
+ group => 'nagios',
+ mode => '0775',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_spool_t,
+ seluser => system_u,
+ }
+
+ # checkresults dir
+
+ file { $ng_checkresults_dir:
+ ensure => directory,
+ path => $ng_checkresults_dir,
+ owner => 'nagios',
+ group => 'nagios',
+ mode => '0770',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_spool_t,
+ 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 c966da6..0050bdc 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html
@@ -120,7 +120,19 @@
22
23
24
-25
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
# File 'manifests/main/install.pp', line 6
@@ -132,16 +144,28 @@ class confdroid_nagios::main::install (
require confdroid_resources
# if our FQDN matches the configured Nagios server FQDN, install both server-
# and client packages.
- if $fqdn == $ng_nagios_server {
- # we'll need httpd installed
- require confdroid_apache
+ # we'll need httpd installed
+ require confdroid_apache
- package {$ng_reqpackages_server:
- ensure => $ng_pkg_ensure,
- }
- package {$ng_reqpackages_client:
- ensure => $ng_pkg_ensure,
- }
+ package {$ng_reqpackages_server:
+ ensure => $ng_pkg_ensure,
+ }
+ package {$ng_reqpackages_client:
+ ensure => $ng_pkg_ensure,
+ }
+ }
+
+ # 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 $ng_include_nrpe == true {
+ require cd_nrpe
}
}
}
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
index ddd9c86..9f2e058 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
@@ -342,7 +342,12 @@ inherited by all classes except defines.
61
62
63
-64
+64
+65
+66
+67
+68
+69
|
# File 'manifests/params.pp', line 24
@@ -384,6 +389,11 @@ class confdroid_nagios::params (
$ng_log_dir = '/var/log/nagios'
$ng_log_archives = "${ng_log_dir}/archives"
$ng_spool_dir = '/var/spool/nagios'
+ $ng_usr_share = '/usr/share/nagios'
+ $ng_share_html = "${ng_usr_share}/html"
+ $ng_run_dir = '/var/run/nagios'
+ $ng_cmd_dir = "${ng_spool_dir}/cmd"
+ $ng_checkresults_dir = "${ng_spool_dir}/checkresults"
# includes must be last
include confdroid_nagios::main::config
|