diff --git a/Gemfile b/Gemfile index 2cfb945..ed878f1 100644 --- a/Gemfile +++ b/Gemfile @@ -9,11 +9,11 @@ gem 'facter' gem 'rspec-puppet' gem 'yard' gem 'puppet-strings', '< 2.0.0' -gem 'rake' gem 'semantic_puppet' gem 'rgen' gem 'public_suffix', '<= 2.0.5' gem 'parallel', '<= 1.13.0' +gem 'rake', '~> 12.3', '>= 12.3.3' # rspec must be v2 for ruby 1.8.7 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' diff --git a/templates/httpd/nagios_ssl_vhost.erb b/templates/httpd/nagios_ssl_vhost.erb index c58c98a..9adab84 100644 --- a/templates/httpd/nagios_ssl_vhost.erb +++ b/templates/httpd/nagios_ssl_vhost.erb @@ -49,8 +49,8 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/" <% unless @ng_required_hosts.empty? -%> Require host <%= @ng_required_hosts %> <% end -%> -<% unless @ng_required_ips.empty? -%> - Require ip <%= @ng_required_ips %> +<% unless @source_range.empty? -%> + Require ip <%= @source_range %> <% end -%> AuthName "Nagios Access" AuthType Basic @@ -63,8 +63,8 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/" <% unless @ng_required_hosts.empty? -%> Allow from <%= @ng_required_hosts %> <% end -%> -<% unless @ng_required_ips.empty? -%> - Allow from <%= @ng_required_ips %> +<% unless @source_range.empty? -%> + Allow from <%= @source_range %> <% end -%> AuthName "Nagios Access" AuthType Basic @@ -89,8 +89,8 @@ Alias /nagios "/usr/share/nagios/html" <% unless @ng_required_hosts.empty? -%> Require host <%= @ng_required_hosts %> <% end -%> -<% unless @ng_required_ips.empty? -%> - Require ip <%= @ng_required_ips %> +<% unless @source_range.empty? -%> + Require ip <%= @source_range %> <% end -%> AuthName "Nagios Access" AuthType Basic @@ -103,8 +103,8 @@ Alias /nagios "/usr/share/nagios/html" <% unless @ng_required_hosts.empty? -%> Allow from <%= @ng_required_hosts %> <% end -%> -<% unless @ng_required_ips.empty? -%> - Allow from <%= @ng_required_ips %> +<% unless @source_range.empty? -%> + Allow from <%= @source_range %> <% end -%> AuthName "Nagios Access" AuthType Basic