+
+
+
+
Array of FQDNs for hosts which -should be allowed/required. -every entry in the array creates a new line in -the configuration file.
+String of FQDNs for hosts which +should be +allowed/required. Requires format +'host1.example.com +host2.example.com'
Array of <b>_<em>Ip addresses __** for hosts which +
string of <b>_<em>Ip addresses __** for hosts which should be -allowed/reqired. every entry in the array creates a new line in -the -configuration fileIp addresses _</em></b> for hosts -which -should be allowed/reqired. every entry in the array creates a new -line in -the configuration file
+allowed/reqired. Requires format 'ipaddress ip address range'Ip +addresses _</em></b> for hosts which +should be allowed/reqired. +Requires format 'ipaddress ip address range'+203 204 205 206 @@ -2029,11 +2028,10 @@ the configuration file 357 358 359 -360 -361+360
# File 'manifests/params.pp', line 204 +# File 'manifests/params.pp', line 203 class cd_nagios::params ( @@ -2142,8 +2140,8 @@ $ng_ack_no_send = '0', $ng_use_selinux_tools = true, # httpd -$ng_required_hosts = [''], -$ng_required_ips = ['127.0.0.0/8'], +$ng_required_hosts = '', +$ng_required_ips = '127.0.0.0/8', ) { @@ -2200,7 +2198,7 @@ $ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.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 fb9a47e..45c3e5b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -249,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 f41565e..a6e798e 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 1df61f4..7d514c3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -228,7 +228,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index ada8a07..2781660 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index e3f13f8..8b98fda 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index b3b4867..b8dd2dc 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ diff --git a/manifests/params.pp b/manifests/params.pp index 7a0e6ea..2a1adee 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -194,12 +194,11 @@ # "Send Notification" to be unchecked. # @param [boolean] ng_use_selinux_tools Whether to enable selinux tools and # policies. only effective if selinux is enabled. -# @param [array] ng_required_hosts Array of **__FQDNs__** for hosts which -# should be allowed/required. every entry in the array creates a new line in -# the configuration file. -# @param [array] ng_required_ips Array of **__Ip addresses __** for hosts which -# should be allowed/reqired. every entry in the array creates a new line in -# the configuration file +# @param [string] ng_required_hosts String of **__FQDNs__** for hosts which +# should be allowed/required. Requires format +# 'host1.example.com host2.example.com' +# @param [string] ng_required_ips string of **__Ip addresses __** for hosts which +# should be allowed/reqired. Requires format 'ipaddress ip address range' ############################################################################### class cd_nagios::params ( @@ -308,8 +307,8 @@ $ng_ack_no_send = '0', $ng_use_selinux_tools = true, # httpd -$ng_required_hosts = [''], -$ng_required_ips = ['127.0.0.0/8'], +$ng_required_hosts = '', +$ng_required_ips = '127.0.0.0/8', ) { diff --git a/templates/httpd/nagios_conf.erb b/templates/httpd/nagios_conf.erb index 8337061..2e84105 100644 --- a/templates/httpd/nagios_conf.erb +++ b/templates/httpd/nagios_conf.erb @@ -19,14 +19,12 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/"= 2.3> Require all granted -<% if @ng_required_hosts != '' -%> -<% @ng_required_hosts.each do |required_host| -%> - Require host <%= required_host %> -<% end end -%> -<% if @ng_required_ips != '' -%> -<% @ng_required_ips.each do |required_ips| -%> +<% unless @ng_required_hosts.empty? -%> + Require host <%= @ng_required_hosts %> +<% end -%> +<% unless @ng_required_ips.empty? -%> Require ip <%= required_ips %> -<% end end -%> +<% end -%> AuthName "Nagios Access" AuthType Basic AuthUserFile /etc/nagios/passwd @@ -56,14 +54,12 @@ Alias /nagios "/usr/share/nagios/html" = 2.3> Require all granted -<% if @ng_required_hosts != '' -%> -<% @ng_required_hosts.each do |required_host| -%> - Require host <%= required_host %> -<% end end -%> -<% if @ng_required_ips != '' %> -<% @ng_required_ips.each do |required_ips| -%> +<% unless @ng_required_hosts.empty? -%> + Require host <%= @ng_required_hosts %> +<% end -%> +<% unless @ng_required_ips.empty? -%> Require ip <%= required_ips %> -<% end end -%> +<% end -%> AuthName "Nagios Access" AuthType Basic AuthUserFile /etc/nagios/passwd