diff --git a/manifests/params.pp b/manifests/params.pp index aca21ce..69594d9 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -600,7 +600,7 @@ class confdroid_nagios::params ( String $ng_statusmap_layout = '6', String $ng_wrl_layout = '4', Boolean $ng_incl_own_wrl = false, - String $ng_statuswrl_incl = '', + Optional[String] $ng_statuswrl_incl = undef, String $ng_ping_syntax = '/bin/ping -n -U -c 5 $HOSTADDRESS$', String $ng_refresh_rate = '90', String $ng_enable_page_tour = '1', diff --git a/templates/nagios/cgi_cfg.erb b/templates/nagios/cgi_cfg.erb index e3b2fda..29ae0f4 100644 --- a/templates/nagios/cgi_cfg.erb +++ b/templates/nagios/cgi_cfg.erb @@ -30,31 +30,31 @@ authorized_for_all_hosts=<%= @ng_main_user %>,<%= @ng_hostview_auth %> authorized_for_all_service_commands=<%= @ng_main_user %>,<%= @ng_svc_cmd_auth %> authorized_for_all_host_commands=<%= @ng_main_user %>,<%= @ng_host_cmd_auth %> -#<% unless @ng_readonly_auth.empty? -%> -#authorized_for_read_only=<%= @ng_readonly_auth %> -#<% end -%> -#<% unless @ng_statusmap_img.empty? -%> -#statusmap_background_image=<%= @ng_statusmap_img %> -#<% end -%> +<% unless @ng_readonly_auth.empty? -%> +authorized_for_read_only=<%= @ng_readonly_auth %> +<% end -%> +<% unless @ng_statusmap_img.empty? -%> +statusmap_background_image=<%= @ng_statusmap_img %> +<% end -%> -#<% if @ng_use_colormap == true -%> -#color_transparency_index_r=<%= @ng_colormap_red %> -#color_transparency_index_g=<%= @ng_colormap_green %> -#color_transparency_index_b=<%= @ng_colormap_blue %> -#<% else -%> +<% if @ng_use_colormap == true -%> +color_transparency_index_r=<%= @ng_colormap_red %> +color_transparency_index_g=<%= @ng_colormap_green %> +color_transparency_index_b=<%= @ng_colormap_blue %> +<% else -%> #color_transparency_index_r=255 #color_transparency_index_g=255 #color_transparency_index_b=255 -#<% end -%> +<% end -%> default_statusmap_layout=<%= @ng_statusmap_layout%> default_statuswrl_layout=<%= @ng_wrl_layout %> -<% if @ng_incl_own_wrl == true -%> -statuswrl_include=<%= @ng_statuswrl_incl %> -<% else -%> +#<% if @ng_incl_own_wrl == true -%> +#statuswrl_include=<%= @ng_statuswrl_incl %> +#<% else -%> #statuswrl_include=myworld.wrl -<% end -%> +#<% end -%> ping_syntax=<%= @ng_ping_syntax %> refresh_rate=<%= @ng_refresh_rate %>