diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d0dfd1..a295f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

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

+

syntax

+ +

+77229e2b0398b3e Jenkins Server 2017-07-28 16:05:00 +

+

recommit for updates in build 13

+ +

ff5a3faf9e8e142 Arne Teuke 2017-07-28 15:58:16

syntax

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index b1e6281..3714620 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -44,7 +44,7 @@ | |-- init.pp | `-- params.pp |-- templates -| `-- nrpe_cfg_head.erb +| `-- nrpe_cfg.erb |-- tests | `-- UTF_Files |-- CHANGELOG.md diff --git a/doc/_index.html b/doc/_index.html index cd86146..cc4b2b1 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 b68e89a..36c21f6 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 60043f4..9f0806f 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 6715db9..a207b5f 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 6ff1f0b..3b6436a 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 1eeb454..e2a4c5a 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 ff92a56..a56a578 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 1321627..5667698 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -169,7 +169,7 @@ class cd_nrpe::main::files ( selrole => object_r, seltype => nrpe_etc_t, seluser => system_u, - content => template($ne_main_conf_file), + content => template($ne_nrpe_conf_erb), notify => Service[$ne_service], } @@ -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 d475f48..f415b3d 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 7f17595..a72971a 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 47575dd..e558225 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 6975cb3..8d5b694 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -945,7 +945,7 @@ $ne_run_dir = '/var/run/nrpe' # files $ne_main_conf_file = '/etc/nagios/nrpe.cfg' -$ne_nrpe_conf_head_erb = 'cd_nrpe/nrpe_cfg_head.erb' +$ne_nrpe_conf_erb = 'cd_nrpe/nrpe_cfg.erb' $ne_nrpe_pid_file = "${ne_run_dir}/nrpe.pid" # includes must be last @@ -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 4e67d68..e4d7353 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 2578011..69cb747 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ diff --git a/manifests/main/files.pp b/manifests/main/files.pp index 134a080..ed994e2 100644 --- a/manifests/main/files.pp +++ b/manifests/main/files.pp @@ -36,7 +36,7 @@ class cd_nrpe::main::files ( selrole => object_r, seltype => nrpe_etc_t, seluser => system_u, - content => template($ne_main_conf_file), + content => template($ne_nrpe_conf_erb), notify => Service[$ne_service], } diff --git a/manifests/params.pp b/manifests/params.pp index 8537cdc..231a494 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -147,7 +147,7 @@ $ne_run_dir = '/var/run/nrpe' # files $ne_main_conf_file = '/etc/nagios/nrpe.cfg' -$ne_nrpe_conf_head_erb = 'cd_nrpe/nrpe_cfg_head.erb' +$ne_nrpe_conf_erb = 'cd_nrpe/nrpe_cfg.erb' $ne_nrpe_pid_file = "${ne_run_dir}/nrpe.pid" # includes must be last diff --git a/templates/nrpe_cfg_head.erb b/templates/nrpe_cfg.erb similarity index 100% rename from templates/nrpe_cfg_head.erb rename to templates/nrpe_cfg.erb