+
+
|Repo Name| version | Build
Status|
|---|---|---|---|
-|cd_nagios| 0.0.0.6 | cd_nagios| 0.0.0.7 | {Build
Status/]|
|Repo Name| version | Build
Status|
|---|---|---|---|
-|cd_nagios| 0.0.0.6 | cd_nagios| 0.0.0.7 | {Build
Status/]|
Whether to enable selinux tools and policies. only effective if selinux is enabled.
+ + + + +Array of FQDNs for hosts which should be +allowed/required. every entry in +the array creates a new line in the +configuration file.
-198 -199 -200 201 202 203 @@ -1974,10 +1992,19 @@ enabled. 345 346 347 -348+348 +349 +350 +351 +352 +353 +354 +355 +356 +357
# File 'manifests/params.pp', line 198 +# File 'manifests/params.pp', line 201 class cd_nagios::params ( @@ -2085,6 +2112,9 @@ $ng_ack_no_send = '0', # selinux $ng_use_selinux_tools = true, +# httpd +$ng_required_hosts = [''], + ) { # installation section @@ -2100,30 +2130,33 @@ $ng_use_selinux_tools = true, } # service -$ng_service = 'nagios' +$ng_service = 'nagios' +$ae_service = 'httpd' # directories -$ng_main_dir = '/etc/nagios' -$ng_conf_d_dir = "${ng_main_dir}/conf.d" -$ng_objects_dir = "${ng_main_dir}/objects" -$ng_private_dir = "${ng_main_dir}/private" -$ng_usr_incl = '/usr/include/nagios' -$ng_lib_dir = '/usr/lib64/nagios' -$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_main_dir = '/etc/nagios' +$ng_conf_d_dir = "${ng_main_dir}/conf.d" +$ng_objects_dir = "${ng_main_dir}/objects" +$ng_private_dir = "${ng_main_dir}/private" +$ng_usr_incl = '/usr/include/nagios' +$ng_lib_dir = '/usr/lib64/nagios' +$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" # files -$ng_main_config = "${ng_main_dir}/nagios.cfg" -$ng_cgi_cfg_file = "${ng_main_dir}/cgi.cfg" -$ng_cgi_cfg_erb = 'cd_nagios/nagios/cgi_cfg.erb' -$ng_htpasswd_file = "${ng_main_dir}/passwd" -$ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb' -$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb' -$ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb' -$ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb' +$ng_main_config = "${ng_main_dir}/nagios.cfg" +$ng_cgi_cfg_file = "${ng_main_dir}/cgi.cfg" +$ng_cgi_cfg_erb = 'cd_nagios/nagios/cgi_cfg.erb' +$ng_htpasswd_file = "${ng_main_dir}/passwd" +$ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb' +$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb' +$ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb' +$ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb' +$ng_nagios_conf = '/etc/httpd/conf.d/nagios.conf' +$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb' # includes must be last @@ -2137,7 +2170,7 @@ $ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index 8610ee7..9a1c57a 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -182,7 +182,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/. 73 74 75 -76+76 +77
# File 'manifests/selinux/config.pp', line 24
@@ -218,7 +219,7 @@ class cd_nagios::selinux::config (
path => ['/usr/bin','/usr/sbin'],
cwd => $ng_user_home,
require => Exec['create_policy_taccgi'],
- refreshonly => true,
+ refreshonly => true,
}
# sealert status.cgi
@@ -236,7 +237,8 @@ class cd_nagios::selinux::config (
path => ['/usr/bin','/usr/sbin'],
cwd => $ng_user_home,
require => Exec['create_policy_statuscgi'],
- refreshonly => true,
+ refreshonly => true,
+ notify => Service[$ng_service],
}
}
}
@@ -247,7 +249,7 @@ class cd_nagios::selinux::config (
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index adff29d..a8c85c1 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 8cd4a6e..2298ca2 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -156,7 +156,23 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
47
48
49
-50
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
# File 'manifests/server/files.pp', line 23
@@ -187,6 +203,22 @@ class cd_nagios::server::files (
content => template($ng_cgi_cfg_erb),
notify => Service[$ng_service],
}
+
+ # manage nagios.conf for httpd
+
+ file { $ng_nagios_conf:
+ ensure => file,
+ path => $ng_nagios_conf,
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ selrange => s0,
+ selrole => object_r,
+ seltype => httpd_config_t,
+ seluser => system_u,
+ content => template($ng_nagios_conf_erb),
+ notify => Service[$ae_service],
+ }
}
}