From 0b2e9241cac801498efe29320512742f0e11acf4 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 27 Jul 2017 15:40:02 +0100 Subject: [PATCH 1/5] added parameter documentation --- manifests/nagios/objects/add_hostgroups.pp | 3 + .../nagios/objects/add_timeperiod_rules.pp | 4 +- manifests/nagios/objects/add_timeperiods.pp | 11 +- manifests/nagios/objects/templates.pp | 1 - manifests/params.pp | 143 +++++++++--------- 5 files changed, 85 insertions(+), 77 deletions(-) diff --git a/manifests/nagios/objects/add_hostgroups.pp b/manifests/nagios/objects/add_hostgroups.pp index 18255ad..58c1648 100644 --- a/manifests/nagios/objects/add_hostgroups.pp +++ b/manifests/nagios/objects/add_hostgroups.pp @@ -25,6 +25,9 @@ # ng_hostgroup_name => 'example_hostgroup', # ng_hostgroup_alias => 'Example Hostgroup', # } +# @param [string] ng_hostgroup_name Specify the hostgroup short name. +# @param [string] ng_hostgroup_alias Specify the hostgroup alias (long name). +# @param [string] ng_hostgroup_register Whether to register the hostgroup. ############################################################################### define cd_nagios::nagios::objects::add_hostgroups ( diff --git a/manifests/nagios/objects/add_timeperiod_rules.pp b/manifests/nagios/objects/add_timeperiod_rules.pp index a590774..64e240c 100644 --- a/manifests/nagios/objects/add_timeperiod_rules.pp +++ b/manifests/nagios/objects/add_timeperiod_rules.pp @@ -18,8 +18,8 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# @summary Class manages /etc/nagios/conf.d/nagios_timeperiods_add.cfg. incl. -# additional timeperiods via define. +# @summary Class manages /etc/nagios_conf.d/nagios_timeperiods_add.cfg and +# add. hostgroups through external Puppet rules via define. # cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod': # ng_timeperiod_name => 'example_timeperiod', # ng_timeperiod_alias => 'Example timeperiod', diff --git a/manifests/nagios/objects/add_timeperiods.pp b/manifests/nagios/objects/add_timeperiods.pp index f33a823..d0b9efa 100644 --- a/manifests/nagios/objects/add_timeperiods.pp +++ b/manifests/nagios/objects/add_timeperiods.pp @@ -22,8 +22,15 @@ # extermal Puppet rules. # @example # cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod': -# ng_timeperiod_name => 'example_timeperiod', -# ng_timeperiod_alias => 'Example timeperiod', +# ng_timeperiod_name => 'example_timeperiod', +# ng_timeperiod_alias => 'Example timeperiod', +# ng_timep_monday => '00:00-00:00', +# ng_timep_tuesday => '00:00-00:00', +# ng_timep_wednesday => '00:00-00:00', +# ng_timep_thursday => '00:00-00:00', +# ng_timep_friday => '00:00-00:00', +# ng_timep_saturday => '00:00-00:00', +# ng_timep_sunday => '00:00-00:00', # } # @param [string] ng_timep_name Specify the timeperiod short name. # @param [string] ng_timep_alias Specify the timeperiod alias (long name) diff --git a/manifests/nagios/objects/templates.pp b/manifests/nagios/objects/templates.pp index bf11aae..63e9b6f 100644 --- a/manifests/nagios/objects/templates.pp +++ b/manifests/nagios/objects/templates.pp @@ -96,7 +96,6 @@ # @param [string] ng_retry_interval Re-check the service every x minutes # until a hard state can be determined. # @param [string] ng_host_check_command the check command for host checks -# @param [string] ################################################################################ define cd_nagios::nagios::objects::templates ( $ng_template_object = undef, diff --git a/manifests/params.pp b/manifests/params.pp index 0649557..d80096a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -892,7 +892,6 @@ $ng_check_workers = '', $ng_host_down_svc_checks = '0', $ng_enable_load_ctl_options = false, $ng_loadctl_options = 'jobs_max=100;backoff_limit=10;rampup_change=5', -$ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios', ) { @@ -913,85 +912,85 @@ $ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sb } # service -$ng_service = 'nagios' -$ae_service = 'httpd' +$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_nagios_conf = '/etc/httpd/conf.d/nagios.conf' -$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb' -$ng_welcome_conf = '/etc/httpd/conf.d/welcome.conf' -$ng_welcome_conf_erb = 'cd_nagios/httpd/welcome_conf.erb' -$ng_forward_conf = '/etc/httpd/conf.d/nagios_forward.conf' -$ng_forward_conf_erb = 'cd_nagios/httpd/forward_conf.erb' -$ng_get_cert_erb = 'cd_nagios/certbot/get_cert.erb' -$ng_unless_get_cert = 'cd_nagios/certbot/unless_get_cert.erb' -$ng_unless_renew_erb = 'cd_nagios/certbot/unless_renew_cert.erb' -$ng_index_html_file = '/var/www/html/index.html' -$ng_index_html_erb = 'cd_nagios/httpd/index_html.erb' -$ng_ssl_vhost_file = '/etc/httpd/conf.d/nagios_ssl.conf' -$ng_ssl_vhost_erb = 'cd_nagios/httpd/nagios_ssl_vhost.erb' -$ng_nagios_cfg_file = "${ng_main_dir}/nagios.cfg" -$ng_nagios_cfg_erb = 'cd_nagios/nagios/nagios_cfg.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' +$ng_welcome_conf = '/etc/httpd/conf.d/welcome.conf' +$ng_welcome_conf_erb = 'cd_nagios/httpd/welcome_conf.erb' +$ng_forward_conf = '/etc/httpd/conf.d/nagios_forward.conf' +$ng_forward_conf_erb = 'cd_nagios/httpd/forward_conf.erb' +$ng_get_cert_erb = 'cd_nagios/certbot/get_cert.erb' +$ng_unless_get_cert = 'cd_nagios/certbot/unless_get_cert.erb' +$ng_unless_renew_erb = 'cd_nagios/certbot/unless_renew_cert.erb' +$ng_index_html_file = '/var/www/html/index.html' +$ng_index_html_erb = 'cd_nagios/httpd/index_html.erb' +$ng_ssl_vhost_file = '/etc/httpd/conf.d/nagios_ssl.conf' +$ng_ssl_vhost_erb = 'cd_nagios/httpd/nagios_ssl_vhost.erb' +$ng_nagios_cfg_file = "${ng_main_dir}/nagios.cfg" +$ng_nagios_cfg_erb = 'cd_nagios/nagios/nagios_cfg.erb' # certbot -$ng_certbot_main_dir = '/etc/letsencrypt' -$ng_certbot_archive = "${ng_certbot_main_dir}/archive" -$ng_certbot_check = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem" -$ng_certbot_live = "${ng_certbot_main_dir}/live" +$ng_certbot_main_dir = '/etc/letsencrypt' +$ng_certbot_archive = "${ng_certbot_main_dir}/archive" +$ng_certbot_check = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem" +$ng_certbot_live = "${ng_certbot_main_dir}/live" # nagios -$ng_target_templates = "${ng_conf_d_dir}/nagios_templates.cfg" -$ng_templates_head_erb = 'cd_nagios/nagios/templates_cfg_head.erb' -$ng_templates_rule_erb = 'cd_nagios/nagios/templates_cfg_rule.erb' -$ng_tgt_timeperiods_base = "${ng_conf_d_dir}/nagios_timeperiods.cfg" -$ng_tgt_timeperiods_add = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg" -$ng_tgt_timep_head_erb = 'cd_nagios/nagios/timeperiods_cfg_head.erb' -$ng_tgt_timep_rule_erb = 'cd_nagios/nagios/timeperiods_cfg_rule.erb' -$ng_target_localhost = "${ng_conf_d_dir}/nagios_localhost.cfg" -$ng_target_host = "${ng_conf_d_dir}/nagios_host.cfg" -$ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg" -$ng_tgt_hostgroup_add = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg" -$ng_tgt_hostgrp_head_erb = 'cd_nagios/nagios/hostgroups_cfg_head.erb' -$ng_tgt_hostgrp_rule_erb = 'cd_nagios/nagios/hostgroups_cfg_rule.erb' -$ng_target_hostdep = "${ng_conf_d_dir}/nagios_hostdependency.cfg" -$ng_target_hostesc = "${ng_conf_d_dir}/nagios_hostescalation.cfg" -$ng_target_hostext = "${ng_conf_d_dir}/nagios_hostextinfo.cfg" -$ng_target_service = "${ng_conf_d_dir}/nagios_service.cfg" -$ng_target_svcgrp_base = "${ng_conf_d_dir}/nagios_servicegroups_base.cfg" -$ng_tgt_servicegroup_add = "${ng_conf_d_dir}/nagios_servicegroups_add.cfg" -$ng_tgt_svcgrp_head_erb = 'cd_nagios/nagios/svcgroups_cfg_head.erb' -$ng_tgt_hostgrp_rule_erb = 'cd_nagios/nagios/svcgroups_cfg_rule.erb' -$ng_target_base_contact = "${ng_conf_d_dir}/nagios_contact_base.cfg" -$ng_target_add_contact = "${ng_conf_d_dir}/nagios_contact_add.cfg" -$ng_contacts_head_erb = 'cd_nagios/nagios/contacts_cfg_head.erb' -$ng_contacts_rule_erb = 'cd_nagios/nagios/contacts_cfg_rule.erb' -$ng_tgt_contactgroup_base = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg" -$ng_tgt_contactgroup_add = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg" -$ng_cntctgrps_head_erb = 'cd_nagios/nagios/contactgroups_cfg_head.erb' -$ng_cntctgrps_rule_erb = 'cd_nagios/nagios/contactgroups_cfg_rule.erb' -$ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" - +$ng_target_templates = "${ng_conf_d_dir}/nagios_templates.cfg" +$ng_templates_head_erb = 'cd_nagios/nagios/templates_cfg_head.erb' +$ng_templates_rule_erb = 'cd_nagios/nagios/templates_cfg_rule.erb' +$ng_tgt_timeperiods_base = "${ng_conf_d_dir}/nagios_timeperiods.cfg" +$ng_tgt_timeperiods_add = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg" +$ng_tgt_timep_head_erb = 'cd_nagios/nagios/timeperiods_cfg_head.erb' +$ng_tgt_timep_rule_erb = 'cd_nagios/nagios/timeperiods_cfg_rule.erb' +$ng_target_localhost = "${ng_conf_d_dir}/nagios_localhost.cfg" +$ng_target_host = "${ng_conf_d_dir}/nagios_host.cfg" +$ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg" +$ng_tgt_hostgroup_add = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg" +$ng_tgt_hostgrp_head_erb = 'cd_nagios/nagios/hostgroups_cfg_head.erb' +$ng_tgt_hostgrp_rule_erb = 'cd_nagios/nagios/hostgroups_cfg_rule.erb' +$ng_target_hostdep = "${ng_conf_d_dir}/nagios_hostdependency.cfg" +$ng_target_hostesc = "${ng_conf_d_dir}/nagios_hostescalation.cfg" +$ng_target_hostext = "${ng_conf_d_dir}/nagios_hostextinfo.cfg" +$ng_target_service = "${ng_conf_d_dir}/nagios_service.cfg" +$ng_target_svcgrp_base = "${ng_conf_d_dir}/nagios_servicegroups_base.cfg" +$ng_tgt_servicegroup_add = "${ng_conf_d_dir}/nagios_servicegroups_add.cfg" +$ng_tgt_svcgrp_head_erb = 'cd_nagios/nagios/svcgroups_cfg_head.erb' +$ng_tgt_hostgrp_rule_erb = 'cd_nagios/nagios/svcgroups_cfg_rule.erb' +$ng_target_base_contact = "${ng_conf_d_dir}/nagios_contact_base.cfg" +$ng_target_add_contact = "${ng_conf_d_dir}/nagios_contact_add.cfg" +$ng_contacts_head_erb = 'cd_nagios/nagios/contacts_cfg_head.erb' +$ng_contacts_rule_erb = 'cd_nagios/nagios/contacts_cfg_rule.erb' +$ng_tgt_contactgroup_base = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg" +$ng_tgt_contactgroup_add = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg" +$ng_cntctgrps_head_erb = 'cd_nagios/nagios/contactgroups_cfg_head.erb' +$ng_cntctgrps_rule_erb = 'cd_nagios/nagios/contactgroups_cfg_rule.erb' +$ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" +$ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios', # includes must be last From 2d228458140a9c829bcd03990592ecbc1f7e752a Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 27 Jul 2017 15:42:22 +0100 Subject: [PATCH 2/5] fixed typo --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index d80096a..1fe2311 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -980,7 +980,7 @@ $ng_target_service = "${ng_conf_d_dir}/nagios_service.cfg" $ng_target_svcgrp_base = "${ng_conf_d_dir}/nagios_servicegroups_base.cfg" $ng_tgt_servicegroup_add = "${ng_conf_d_dir}/nagios_servicegroups_add.cfg" $ng_tgt_svcgrp_head_erb = 'cd_nagios/nagios/svcgroups_cfg_head.erb' -$ng_tgt_hostgrp_rule_erb = 'cd_nagios/nagios/svcgroups_cfg_rule.erb' +$ng_tgt_svcgrp_rule_erb = 'cd_nagios/nagios/svcgroups_cfg_rule.erb' $ng_target_base_contact = "${ng_conf_d_dir}/nagios_contact_base.cfg" $ng_target_add_contact = "${ng_conf_d_dir}/nagios_contact_add.cfg" $ng_contacts_head_erb = 'cd_nagios/nagios/contacts_cfg_head.erb' From 54353625e1ca4d363fcdb0eb0b25e962a074b3e2 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 27 Jul 2017 15:43:29 +0100 Subject: [PATCH 3/5] fixed typo --- .../nagios/objects/add_timeperiod_rules.pp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifests/nagios/objects/add_timeperiod_rules.pp b/manifests/nagios/objects/add_timeperiod_rules.pp index 64e240c..befff62 100644 --- a/manifests/nagios/objects/add_timeperiod_rules.pp +++ b/manifests/nagios/objects/add_timeperiod_rules.pp @@ -62,16 +62,16 @@ class cd_nagios::nagios::objects::add_timeperiod_rules ( } # example rule - cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod': - ng_timeperiod_name => 'example_timeperiod', - ng_timeperiod_alias => 'Example timeperiod', - ng_timep_monday => '00:00-00:00', - ng_timep_tuesday => '00:00-00:00', - ng_timep_wednesday => '00:00-00:00', - ng_timep_thursday => '00:00-00:00', - ng_timep_friday => '00:00-00:00', - ng_timep_saturday => '00:00-00:00', - ng_timep_sunday => '00:00-00:00', - } + cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod': + ng_timeperiod_name => 'example_timeperiod', + ng_timeperiod_alias => 'Example timeperiod', + ng_timep_monday => '00:00-00:00', + ng_timep_tuesday => '00:00-00:00', + ng_timep_wednesday => '00:00-00:00', + ng_timep_thursday => '00:00-00:00', + ng_timep_friday => '00:00-00:00', + ng_timep_saturday => '00:00-00:00', + ng_timep_sunday => '00:00-00:00', + } } } From 34e172d7bd1fbb2938c645cca310c718003400b3 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 27 Jul 2017 15:44:07 +0100 Subject: [PATCH 4/5] fixed typo --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 1fe2311..365a32e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -990,7 +990,7 @@ $ng_tgt_contactgroup_add = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg" $ng_cntctgrps_head_erb = 'cd_nagios/nagios/contactgroups_cfg_head.erb' $ng_cntctgrps_rule_erb = 'cd_nagios/nagios/contactgroups_cfg_rule.erb' $ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" -$ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios', +$ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios' # includes must be last From f8d19b46fdae2fb0a10dbd4c5d26b490b46773bc Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 16:44:56 +0200 Subject: [PATCH 5/5] recommit for updates in build 123 --- CHANGELOG.md | 25 +++ REPOSTRUCTURE.md | 5 +- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...Aobjects_3A_3Aadd_contactgroups_rules.html | 2 +- ...3A_3Aobjects_3A_3Aadd_hostgroup_rules.html | 2 +- ...3Aobjects_3A_3Aadd_servicegroup_rules.html | 2 +- ...A_3Aobjects_3A_3Aadd_timeperiod_rules.html | 60 ++++--- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...agios_3A_3Aobjects_3A_3Acontactgroups.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...3Anagios_3A_3Aobjects_3A_3Ahostgroups.html | 2 +- ...agios_3A_3Aobjects_3A_3Aservicegroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- ...Anagios_3A_3Aobjects_3A_3Atimeperiods.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 161 ++++++++---------- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html | 33 +++- ...s_3A_3Aobjects_3A_3Aadd_servicegroups.html | 2 +- ...ios_3A_3Aobjects_3A_3Aadd_timeperiods.html | 31 ++-- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 19 +-- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 39 files changed, 215 insertions(+), 183 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42f892e..aa7faf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,31 @@ Changelog of Git Changelog.

No issue

+137753dafe03b7a Jenkins Server 2017-07-27 14:29:05 +

+

recommit for updates in build 120

+ +

+e76e4f857c4baf8 Arne Teuke 2017-07-27 14:28:21 +

+

added and linked add_timeperiods

+ +

+82aee3bacd72ce0 Arne Teuke 2017-07-27 13:50:07 +

+

added timeperiod

+ +

+45682bbc67ffc7e Arne Teuke 2017-07-27 13:46:49 +

+

added timeperiod

+ +

+65e0a0d20e19245 Arne Teuke 2017-07-27 13:42:38 +

+

added timeperiods

+ +

cba65ddb7cb64cf Jenkins Server 2017-07-27 13:33:36

recommit for updates in build 117

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 726b6c3..e49ae41 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -21,6 +21,7 @@ | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html @@ -28,6 +29,7 @@ | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html | | |-- cd_nagios_3A_3Aparams.html | | |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html | | |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -39,6 +41,7 @@ | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | | `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html | |-- file.README.html @@ -129,4 +132,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 109 files +20 directories, 112 files diff --git a/doc/_index.html b/doc/_index.html index f08a580..7553126 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -281,7 +281,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 06ff9bd..307c53a 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -376,7 +376,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index d8bc10e..0345887 100644 --- a/doc/index.html +++ b/doc/index.html @@ -376,7 +376,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index ed25839..f64498a 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index 7651f58..d0e553c 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index dd52d1e..d9e3436 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 0c2b034..0b4df58 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index a382212..eec0dac 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index c00c0f2..5decab1 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 8bab28c..677d858 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 79f60da..a986a81 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html index aa27297..88e94a3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html @@ -210,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html index 4c308eb..5134095 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html @@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html index 45fa6b2..3cfed5d 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html @@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html index bef0613..96c5fe3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html @@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html index 41548f5..5a95090 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html @@ -77,19 +77,8 @@

Summary

- Class manages /etc/nagios/conf.d/nagios_timeperiods_add.cfg. incl. -additional timeperiods via define. -cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod': - ng_timeperiod_name => 'example_timeperiod', - ng_timeperiod_alias => 'Example timeperiod', - ng_timep_monday => '00:00-00:00', - ng_timep_tuesday => '00:00-00:00', - ng_timep_wednesday => '00:00-00:00', - ng_timep_thursday => '00:00-00:00', - ng_timep_friday => '00:00-00:00', - ng_timep_saturday => '00:00-00:00', - ng_timep_sunday => '00:00-00:00', -} + Class manages /etc/nagios_conf.d/nagios_timeperiods_add.cfg and +add. hostgroups through external Puppet rules via define.

Overview

@@ -127,7 +116,26 @@ for more details.

You should have received a copy of the GNU General Public License along with this program. If not, see www.gnu.org/licenses/.

+href="http://www.gnu.org/licenses">www.gnu.org/licenses/. + +cd_nagios::nagios::objects::add_timeperiods { +'example_timeperiod': + ng_timeperiod_name => +'example_timeperiod', + ng_timeperiod_alias => 'Example +timeperiod', + ng_timep_monday => '00:00-00:00', + +ng_timep_tuesday => '00:00-00:00', + ng_timep_wednesday => +'00:00-00:00', + ng_timep_thursday => '00:00-00:00', + +ng_timep_friday => '00:00-00:00', + ng_timep_saturday => +'00:00-00:00', + ng_timep_sunday => '00:00-00:00', + }

@@ -218,17 +226,17 @@ class cd_nagios::nagios::objects::add_timeperiod_rules ( } # example rule - cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod': - ng_timeperiod_name => 'example_timeperiod', - ng_timeperiod_alias => 'Example timeperiod', - ng_timep_monday => '00:00-00:00', - ng_timep_tuesday => '00:00-00:00', - ng_timep_wednesday => '00:00-00:00', - ng_timep_thursday => '00:00-00:00', - ng_timep_friday => '00:00-00:00', - ng_timep_saturday => '00:00-00:00', - ng_timep_sunday => '00:00-00:00', - } + cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod': + ng_timeperiod_name => 'example_timeperiod', + ng_timeperiod_alias => 'Example timeperiod', + ng_timep_monday => '00:00-00:00', + ng_timep_tuesday => '00:00-00:00', + ng_timep_wednesday => '00:00-00:00', + ng_timep_thursday => '00:00-00:00', + ng_timep_friday => '00:00-00:00', + ng_timep_saturday => '00:00-00:00', + ng_timep_sunday => '00:00-00:00', + } } } @@ -238,7 +246,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index 83f51d3..f4294ed 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html @@ -597,7 +597,7 @@ class cd_nagios::nagios::objects::commands ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html index 9014130..d8e0b0e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html @@ -180,7 +180,7 @@ class cd_nagios::nagios::objects::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html index 8ba118f..0845e93 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html @@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html index 911b44d..b385b90 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html @@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html index 2c57117..9a8f5b6 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html @@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html index cfd2e44..77a0747 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html @@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index ea78e2d..63b10c7 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html @@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html index 5076557..54c3db0 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html @@ -285,7 +285,7 @@ class cd_nagios::nagios::objects::timeperiods ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 34508d7..8c968ac 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -4875,19 +4875,6 @@ up

-
  • - - ng_nagios_service_cmd - - - (Any) - - - (defaults to: 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios') - - -
    • - @@ -5258,8 +5245,7 @@ up

    996 997 998 -999 -1000 +999 
    # File 'manifests/params.pp', line 646
@@ -5513,7 +5499,6 @@ $ng_check_workers           = '',
 $ng_host_down_svc_checks    = '0',
 $ng_enable_load_ctl_options = false,
 $ng_loadctl_options         = 'jobs_max=100;backoff_limit=10;rampup_change=5',
-$ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios',
 
 ) {
 
@@ -5534,85 +5519,85 @@ $ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/us
   }
 
 # service
-$ng_service               = 'nagios'
-$ae_service               = 'httpd'
+$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_nagios_conf           = '/etc/httpd/conf.d/nagios.conf'
-$ng_nagios_conf_erb       = 'cd_nagios/httpd/nagios_conf.erb'
-$ng_welcome_conf          = '/etc/httpd/conf.d/welcome.conf'
-$ng_welcome_conf_erb      = 'cd_nagios/httpd/welcome_conf.erb'
-$ng_forward_conf          = '/etc/httpd/conf.d/nagios_forward.conf'
-$ng_forward_conf_erb      = 'cd_nagios/httpd/forward_conf.erb'
-$ng_get_cert_erb          = 'cd_nagios/certbot/get_cert.erb'
-$ng_unless_get_cert       = 'cd_nagios/certbot/unless_get_cert.erb'
-$ng_unless_renew_erb      = 'cd_nagios/certbot/unless_renew_cert.erb'
-$ng_index_html_file       = '/var/www/html/index.html'
-$ng_index_html_erb        = 'cd_nagios/httpd/index_html.erb'
-$ng_ssl_vhost_file        = '/etc/httpd/conf.d/nagios_ssl.conf'
-$ng_ssl_vhost_erb         = 'cd_nagios/httpd/nagios_ssl_vhost.erb'
-$ng_nagios_cfg_file       = "${ng_main_dir}/nagios.cfg"
-$ng_nagios_cfg_erb        = 'cd_nagios/nagios/nagios_cfg.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'
+$ng_welcome_conf            = '/etc/httpd/conf.d/welcome.conf'
+$ng_welcome_conf_erb        = 'cd_nagios/httpd/welcome_conf.erb'
+$ng_forward_conf            = '/etc/httpd/conf.d/nagios_forward.conf'
+$ng_forward_conf_erb        = 'cd_nagios/httpd/forward_conf.erb'
+$ng_get_cert_erb            = 'cd_nagios/certbot/get_cert.erb'
+$ng_unless_get_cert         = 'cd_nagios/certbot/unless_get_cert.erb'
+$ng_unless_renew_erb        = 'cd_nagios/certbot/unless_renew_cert.erb'
+$ng_index_html_file         = '/var/www/html/index.html'
+$ng_index_html_erb          = 'cd_nagios/httpd/index_html.erb'
+$ng_ssl_vhost_file          = '/etc/httpd/conf.d/nagios_ssl.conf'
+$ng_ssl_vhost_erb           = 'cd_nagios/httpd/nagios_ssl_vhost.erb'
+$ng_nagios_cfg_file         = "${ng_main_dir}/nagios.cfg"
+$ng_nagios_cfg_erb          = 'cd_nagios/nagios/nagios_cfg.erb'
 
 # certbot
-$ng_certbot_main_dir      = '/etc/letsencrypt'
-$ng_certbot_archive       = "${ng_certbot_main_dir}/archive"
-$ng_certbot_check         = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
-$ng_certbot_live          = "${ng_certbot_main_dir}/live"
+$ng_certbot_main_dir        = '/etc/letsencrypt'
+$ng_certbot_archive         = "${ng_certbot_main_dir}/archive"
+$ng_certbot_check           = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
+$ng_certbot_live            = "${ng_certbot_main_dir}/live"
 
 # nagios
-$ng_target_templates      = "${ng_conf_d_dir}/nagios_templates.cfg"
-$ng_templates_head_erb    = 'cd_nagios/nagios/templates_cfg_head.erb'
-$ng_templates_rule_erb    = 'cd_nagios/nagios/templates_cfg_rule.erb'
-$ng_tgt_timeperiods_base  = "${ng_conf_d_dir}/nagios_timeperiods.cfg"
-$ng_tgt_timeperiods_add   = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg"
-$ng_tgt_timep_head_erb    = 'cd_nagios/nagios/timeperiods_cfg_head.erb'
-$ng_tgt_timep_rule_erb    = 'cd_nagios/nagios/timeperiods_cfg_rule.erb'
-$ng_target_localhost      = "${ng_conf_d_dir}/nagios_localhost.cfg"
-$ng_target_host           = "${ng_conf_d_dir}/nagios_host.cfg"
-$ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
-$ng_tgt_hostgroup_add     = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg"
-$ng_tgt_hostgrp_head_erb  = 'cd_nagios/nagios/hostgroups_cfg_head.erb'
-$ng_tgt_hostgrp_rule_erb  = 'cd_nagios/nagios/hostgroups_cfg_rule.erb'
-$ng_target_hostdep        = "${ng_conf_d_dir}/nagios_hostdependency.cfg"
-$ng_target_hostesc        = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
-$ng_target_hostext        = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
-$ng_target_service        = "${ng_conf_d_dir}/nagios_service.cfg"
-$ng_target_svcgrp_base    = "${ng_conf_d_dir}/nagios_servicegroups_base.cfg"
-$ng_tgt_servicegroup_add  = "${ng_conf_d_dir}/nagios_servicegroups_add.cfg"
-$ng_tgt_svcgrp_head_erb   = 'cd_nagios/nagios/svcgroups_cfg_head.erb'
-$ng_tgt_hostgrp_rule_erb  = 'cd_nagios/nagios/svcgroups_cfg_rule.erb'
-$ng_target_base_contact   = "${ng_conf_d_dir}/nagios_contact_base.cfg"
-$ng_target_add_contact    = "${ng_conf_d_dir}/nagios_contact_add.cfg"
-$ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
-$ng_contacts_rule_erb     = 'cd_nagios/nagios/contacts_cfg_rule.erb'
-$ng_tgt_contactgroup_base = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg"
-$ng_tgt_contactgroup_add  = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg"
-$ng_cntctgrps_head_erb    = 'cd_nagios/nagios/contactgroups_cfg_head.erb'
-$ng_cntctgrps_rule_erb    = 'cd_nagios/nagios/contactgroups_cfg_rule.erb'
-$ng_target_command        = "${ng_conf_d_dir}/nagios_commands_base.cfg"
-
+$ng_target_templates        = "${ng_conf_d_dir}/nagios_templates.cfg"
+$ng_templates_head_erb      = 'cd_nagios/nagios/templates_cfg_head.erb'
+$ng_templates_rule_erb      = 'cd_nagios/nagios/templates_cfg_rule.erb'
+$ng_tgt_timeperiods_base    = "${ng_conf_d_dir}/nagios_timeperiods.cfg"
+$ng_tgt_timeperiods_add     = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg"
+$ng_tgt_timep_head_erb      = 'cd_nagios/nagios/timeperiods_cfg_head.erb'
+$ng_tgt_timep_rule_erb      = 'cd_nagios/nagios/timeperiods_cfg_rule.erb'
+$ng_target_localhost        = "${ng_conf_d_dir}/nagios_localhost.cfg"
+$ng_target_host             = "${ng_conf_d_dir}/nagios_host.cfg"
+$ng_target_hostgroup_base   = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
+$ng_tgt_hostgroup_add       = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg"
+$ng_tgt_hostgrp_head_erb    = 'cd_nagios/nagios/hostgroups_cfg_head.erb'
+$ng_tgt_hostgrp_rule_erb    = 'cd_nagios/nagios/hostgroups_cfg_rule.erb'
+$ng_target_hostdep          = "${ng_conf_d_dir}/nagios_hostdependency.cfg"
+$ng_target_hostesc          = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
+$ng_target_hostext          = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
+$ng_target_service          = "${ng_conf_d_dir}/nagios_service.cfg"
+$ng_target_svcgrp_base      = "${ng_conf_d_dir}/nagios_servicegroups_base.cfg"
+$ng_tgt_servicegroup_add    = "${ng_conf_d_dir}/nagios_servicegroups_add.cfg"
+$ng_tgt_svcgrp_head_erb     = 'cd_nagios/nagios/svcgroups_cfg_head.erb'
+$ng_tgt_svcgrp_rule_erb     = 'cd_nagios/nagios/svcgroups_cfg_rule.erb'
+$ng_target_base_contact     = "${ng_conf_d_dir}/nagios_contact_base.cfg"
+$ng_target_add_contact      = "${ng_conf_d_dir}/nagios_contact_add.cfg"
+$ng_contacts_head_erb       = 'cd_nagios/nagios/contacts_cfg_head.erb'
+$ng_contacts_rule_erb       = 'cd_nagios/nagios/contacts_cfg_rule.erb'
+$ng_tgt_contactgroup_base   = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg"
+$ng_tgt_contactgroup_add    = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg"
+$ng_cntctgrps_head_erb      = 'cd_nagios/nagios/contactgroups_cfg_head.erb'
+$ng_cntctgrps_rule_erb      = 'cd_nagios/nagios/contactgroups_cfg_rule.erb'
+$ng_target_command          = "${ng_conf_d_dir}/nagios_commands_base.cfg"
+$ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios'
 
 # includes must be last
 
@@ -5626,7 +5611,7 @@ $ng_target_command        = "${ng_conf_d_dir}/nagios_commands_base.cfg"
 
 
       
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 2f3b673..20e5f0d 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 ba9d359..06ec56f 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 50c8465..9e6ebc1 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,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 f29e227..b57abe8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -304,7 +304,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
index d11a5cc..2162eb7 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
@@ -285,7 +285,7 @@ $ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
index a882faf..f56811b 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
@@ -237,7 +237,7 @@ $ng_cntctgrps_rule_erb    = $::cd_nagios::params::ng_cntctgrps_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
index 8735d80..12112de 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
@@ -133,12 +133,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
         ng_hostgroup_name
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    Specify the hostgroup short name.
    
+
    
+      
     
   
     
  • 
@@ -146,12 +151,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
         ng_hostgroup_alias
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    Specify the hostgroup alias (long name).
    
+
    
+      
     
    • 
   
     
  • 
@@ -159,12 +169,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
         ng_hostgroup_register
       
       
-        (Any)
+        (string)
       
       
         (defaults to: '1')
       
       
+        —
+        
    
+
    Whether to register the hostgroup.
    
+
    
+      
     
    • 
   
 
@@ -177,9 +192,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
         
     
 
-29
-30
-31
 32
 33
 34
@@ -197,10 +209,13 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
 46
 47
 48
-49
    
+49
+50
+51
+52
    - 
    # File 'manifests/nagios/objects/add_hostgroups.pp', line 29
+        
    # File 'manifests/nagios/objects/add_hostgroups.pp', line 32
 
 define cd_nagios::nagios::objects::add_hostgroups (
 
@@ -230,7 +245,7 @@ $ng_tgt_hostgrp_rule_erb  = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
index 72a89ee..4b2968e 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
@@ -228,7 +228,7 @@ $ng_tgt_svcgrp_rule_erb   = $::cd_nagios::params::ng_tgt_svcgrp_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
index 60437a0..3a55f0b 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
@@ -120,8 +120,15 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
     
       
       
    cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
-  ng_timeperiod_name   =>  'example_timeperiod',
-  ng_timeperiod_alias  =>  'Example timeperiod',
+  ng_timeperiod_name   => 'example_timeperiod',
+  ng_timeperiod_alias  => 'Example timeperiod',
+  ng_timep_monday      => '00:00-00:00',
+  ng_timep_tuesday     => '00:00-00:00',
+  ng_timep_wednesday   => '00:00-00:00',
+  ng_timep_thursday    => '00:00-00:00',
+  ng_timep_friday      => '00:00-00:00',
+  ng_timep_saturday    => '00:00-00:00',
+  ng_timep_sunday      => '00:00-00:00',
 }
    
     
   
@@ -341,13 +348,6 @@ for
         
     
 
-42
-43
-44
-45
-46
-47
-48
 49
 50
 51
@@ -368,10 +368,17 @@ for
 66
 67
 68
-69
    
+69
+70
+71
+72
+73
+74
+75
+76
    
       
       
-        
    # File 'manifests/nagios/objects/add_timeperiods.pp', line 42
+        
    # File 'manifests/nagios/objects/add_timeperiods.pp', line 49
 
 define cd_nagios::nagios::objects::add_timeperiods (
 
@@ -408,7 +415,7 @@ $ng_tgt_timep_rule_erb    = $::cd_nagios::params::ng_tgt_timep_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
index 710ca44..9f168d8 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -787,17 +787,6 @@ until a hard state can be determined.
    
       
     
   
-    
  • 
-      
-        
-      
-      
-        (string)
-      
-      
-      
-    
    • 
-  
 
 
 
@@ -808,6 +797,7 @@ until a hard state can be determined.
    
         
     
 
+100
 101
 102
 103
@@ -855,11 +845,10 @@ until a hard state can be determined.
    
 145
 146
 147
-148
-149
    
+148
    
       
       
-        
    # File 'manifests/nagios/objects/templates.pp', line 101
+        
    # File 'manifests/nagios/objects/templates.pp', line 100
 
 define cd_nagios::nagios::objects::templates (
 $ng_template_object               = undef,
@@ -917,7 +906,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 
 
       
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 7f789c1..ace01a5 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 25a8fcf..cfc2987 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@