diff --git a/manifests/nagios/objects/add_contactgroups.pp b/manifests/nagios/objects/add_contactgroups.pp index ca17b52..cf9a611 100644 --- a/manifests/nagios/objects/add_contactgroups.pp +++ b/manifests/nagios/objects/add_contactgroups.pp @@ -16,7 +16,7 @@ define confdroid_nagios::nagios::objects::add_contactgroups ( Optional[String] $ng_contactgroup_name = undef, Optional[String] $ng_contactgroup_alias = undef, - String $ng_contactgroup_members = 'admins', + Optional[String] $ng_contactgroup_members = undef, String $ng_contactgroup_register = '1', ) { diff --git a/manifests/params.pp b/manifests/params.pp index 15d3ca4..a1775f9 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -115,6 +115,7 @@ class confdroid_nagios::params ( # contact groups String $ng_contactgroup_name = 'admins', String $ng_contactgroup_alias = 'Nagios Administrators', + String $ng_contactgroup_members = 'nagiosadmin', # contacts String $ng_contact_name = 'nagiosadmin', diff --git a/templates/nagios/cgi_cfg.erb b/templates/nagios/cgi_cfg.erb index 6c96778..a7745a6 100644 --- a/templates/nagios/cgi_cfg.erb +++ b/templates/nagios/cgi_cfg.erb @@ -19,13 +19,13 @@ default_user_name=<%= @ng_def_user_name %> #default_user_name=guest <% end -%> -authorized_for_system_information=<%= @ng_nagios_admin %>,<%= @ng_sysinfo_auth %> -authorized_for_configuration_information=<%= @ng_nagios_admin %>,<%= @ng_confinfo_auth %> -authorized_for_system_commands=<%= @ng_nagios_admin %>,<%= @ng_command_auth %> -authorized_for_all_services=<%= @ng_nagios_admin %>,<%= @ng_nagios_serviceview_auth %> -authorized_for_all_hosts=<%= @ng_nagios_admin %>,<%= @ng_hostview_auth %> -authorized_for_all_service_commands=<%= @ng_nagios_admin %>,<%= @ng_svc_cmd_auth %> -authorized_for_all_host_commands=<%= @ng_nagios_admin %>,<%= @ng_host_cmd_auth %> +authorized_for_system_information=<%= @ng_contact_name %>,<%= @ng_sysinfo_auth %> +authorized_for_configuration_information=<%= @ng_contact_name %>,<%= @ng_confinfo_auth %> +authorized_for_system_commands=<%= @ng_contact_name %>,<%= @ng_command_auth %> +authorized_for_all_services=<%= @ng_contact_name %>,<%= @ng_nagios_serviceview_auth %> +authorized_for_all_hosts=<%= @ng_contact_name %>,<%= @ng_hostview_auth %> +authorized_for_all_service_commands=<%= @ng_contact_name %>,<%= @ng_svc_cmd_auth %> +authorized_for_all_host_commands=<%= @ng_contact_name %>,<%= @ng_host_cmd_auth %> authorized_for_read_only=<%= @ng_readonly_auth %> statusmap_background_image=<%= @ng_statusmap_img %>