diff --git a/CHANGELOG.md b/CHANGELOG.md index a295f82..100a448 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+b962ee1a2a6d02e Arne Teuke 2017-07-28 16:12:11 +

+

typo

+ +

+156bce6ccc321e1 Jenkins Server 2017-07-28 16:12:04 +

+

recommit for updates in build 15

+ +

+28c39998ec3a6b2 Arne Teuke 2017-07-28 16:11:18 +

+

typo

+ +

2051415f9e80886 Arne Teuke 2017-07-28 16:05:03

syntax

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 3714620..7bebe6c 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -44,7 +44,8 @@ | |-- init.pp | `-- params.pp |-- templates -| `-- nrpe_cfg.erb +| |-- nrpe_cfg.erb +| `-- nrpe_cfg_head.erb |-- tests | `-- UTF_Files |-- CHANGELOG.md @@ -55,4 +56,4 @@ |-- README.md `-- REPOSTRUCTURE.md -11 directories, 44 files +11 directories, 45 files diff --git a/doc/_index.html b/doc/_index.html index cc4b2b1..3647c85 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -166,7 +166,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 36c21f6..27d337b 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -241,7 +241,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 9f0806f..a78179b 100644 --- a/doc/index.html +++ b/doc/index.html @@ -241,7 +241,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index a207b5f..92e2247 100644 --- a/doc/puppet_classes/cd_nrpe.html +++ b/doc/puppet_classes/cd_nrpe.html @@ -140,7 +140,7 @@ class cd_nrpe { diff --git a/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html index 3b6436a..fb0897a 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html @@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html index e2a4c5a..9742660 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html @@ -154,7 +154,7 @@ class cd_nrpe::main::config ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html index a56a578..ea3e420 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html @@ -205,7 +205,7 @@ class cd_nrpe::main::dirs ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html index 5667698..c328e63 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -181,7 +181,7 @@ class cd_nrpe::main::files ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html index f415b3d..553222b 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html @@ -160,7 +160,7 @@ class cd_nrpe::main::install ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html index a72971a..5bf4d44 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html @@ -175,7 +175,7 @@ class cd_nrpe::main::service ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html index e558225..993881a 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html @@ -193,7 +193,7 @@ class cd_nrpe::main::user ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html index 8d5b694..09fb117 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -933,7 +933,7 @@ $ne_include_selinux = true, # installation section $reqpackages = $::operatingsystem ? { - /(?i-mx:centos|fedora|redhat)/ => ['nrpe'], + /(?i-mx:centos|fedora|redhat)/ => ['nrpe','nrpe-selinux'], } # service @@ -960,7 +960,7 @@ $ne_nrpe_pid_file = "${ne_run_dir}/nrpe.pid" diff --git a/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html b/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html index e4d7353..6e71aa5 100644 --- a/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html +++ b/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html @@ -148,7 +148,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 69cb747..3230497 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 231a494..7e3bffb 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -135,7 +135,7 @@ $ne_include_selinux = true, # installation section $reqpackages = $::operatingsystem ? { - /(?i-mx:centos|fedora|redhat)/ => ['nrpe'], + /(?i-mx:centos|fedora|redhat)/ => ['nrpe','nrpe-selinux'], } # service diff --git a/templates/nrpe_cfg_head.erb b/templates/nrpe_cfg_head.erb new file mode 100644 index 0000000..2a9ea1c --- /dev/null +++ b/templates/nrpe_cfg_head.erb @@ -0,0 +1,59 @@ +################################################################################ +########## nrpe.cfg managed by Puppet ########## +########## manual changes will be overwritten !!! ########## +################################################################################ +########## full reference is available at ########## +########## https://confdroid.com/2017/07/nrpe-nrpe-cfg/ ########## +################################################################################ + +log_facility=<%= @ne_log_facility %> + +<% unless @ne_log_file.empty? -%> +log_file=<%= @ne_log_file %> +<% end -%> + +debug=<%= @ne_debug %> + +pid_file=<% @ne_nrpe_pid_file %> +server_port=<%= @ne_nrpe_port %> + +server_address=<%= @ne_server_address %> +listen_queue_size=<%= @ne_listen_queue_size %> + +nrpe_user=<%= @ne_user %> +nrpe_group=<%= @ne_user %> + +allowed_hosts=127.0.0.1,::1,<%= @ne_nagios_server %> +dont_blame_nrpe=<%= @ne_dont_blame_nrpe %> +allow_bash_command_substitution=<%= @ne_allow_bash_cmd_subst %> + +<% if @ne_allow_sudo == true -%> +command_prefix=<%= @ne_command_prefix %> +<% end -%> + +command_timeout=<%= @ne_command_timeout %> +connection_timeout=<%= @ne_connection_timeout %> + +allow_weak_random_seed=<%= @ne_allow_weak_rnd_seed %> + +ssl_version=<%= @ne_ssl_version %> +ssl_use_adh=<%= @ne_ssl_use_adh %> +ssl_cipher_list=<%= @ne_ssl_cipher_list %> + +ssl_cacert_file=<%= @ne_ssl_cacert_file %> +ssl_cert_file=<%= @ne_ssl_cert_file %> +ssl_privatekey_file=<%= @ne_ssl_privatekey_file %> + +ssl_client_certs=<%= @ne_ssl_client_certs %> +ssl_logging=<%= @ne_ssl_logging %> + +nasty_metachars=<%= @ne_nasty_metachars %> + +<% unless @ne_include_file.empty? -%> +include=<%= @ne_include_file %> +<% end -%> + +include_dir=<%= @ne_main_conf_d_dir %> + +### command definitions have been moved to include_dir for easier external +# management