From adde8bf90e044c4669b724e290857700c8014307 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 19:57:26 +0200 Subject: [PATCH 1/5] recommit for updates in build 35 --- CHANGELOG.md | 10 ++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nrpe.html | 2 +- .../cd_nrpe_3A_3Afirewall_3A_3Aiptables.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 2 +- .../cd_nrpe_3A_3Acommands_3A_3Adefinitions.html | 2 +- doc/top-level-namespace.html | 2 +- 15 files changed, 24 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bcc6ef..7850da7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+84b5e09383fa0e2 Arne Teuke 2017-07-28 17:49:08 +

+

updated template

+ +

+7e385567bfbfacf Jenkins Server 2017-07-28 17:49:00 +

+

recommit for updates in build 34

+ +

967d659146b79e6 Jenkins Server 2017-07-28 17:44:09

recommit for updates in build 33

diff --git a/doc/_index.html b/doc/_index.html index d785916..be8a8cc 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 dc13a3f..acb4307 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -252,7 +252,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 52a30c1..8454dd2 100644 --- a/doc/index.html +++ b/doc/index.html @@ -252,7 +252,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index 0147acb..414fc67 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 b4dffe7..0c5ae2b 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 25068ee..2cef7a2 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 5b4389f..8532504 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 2ecfe46..53dd406 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -217,7 +217,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 1215140..88f9d5f 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 5e37caf..d2cdb49 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 cbb8112..c0700f1 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 80f44c6..9ad9e70 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -1007,7 +1007,7 @@ $ne_nrpe_conf_erb = 'cd_nrpe/nrpe_conf.erb' 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 272b296..14d5eb0 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 061f983..80eba38 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From c2e28a255730208ddd249b6078e5c15dcc6d97a0 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 20:26:20 +0200 Subject: [PATCH 2/5] recommit for updates in build 37 --- CHANGELOG.md | 10 ++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nrpe.html | 2 +- .../cd_nrpe_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aservice.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 32 +++++++++++++++---- ...d_nrpe_3A_3Acommands_3A_3Adefinitions.html | 2 +- doc/top-level-namespace.html | 2 +- 15 files changed, 49 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7850da7..482cfd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+7efec6b6a39fc99 Arne Teuke 2017-07-28 17:57:30 +

+

updated template

+ +

+adde8bf90e044c4 Jenkins Server 2017-07-28 17:57:26 +

+

recommit for updates in build 35

+ +

84b5e09383fa0e2 Arne Teuke 2017-07-28 17:49:08

updated template

diff --git a/doc/_index.html b/doc/_index.html index be8a8cc..8c6e0e0 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 acb4307..6ed8e6c 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -252,7 +252,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 8454dd2..9884e16 100644 --- a/doc/index.html +++ b/doc/index.html @@ -252,7 +252,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index 414fc67..79668f6 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 0c5ae2b..978b84c 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 2cef7a2..6e0eb4a 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 8532504..fc79645 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 53dd406..22c7688 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -217,7 +217,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 88f9d5f..88fa79f 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 d2cdb49..d3014c4 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 c0700f1..0a039dc 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 9ad9e70..6584f33 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -423,7 +423,7 @@ to be established before exiting.

(string) - (defaults to: 'TLSv1.1+') + (defaults to: 'TLSv2+') — @@ -825,6 +825,24 @@ needed.

Whether to manage selinux

+
+ + + +
  • + + ne_enable_ssl + + + (boolean) + + + (defaults to: false) + + + — +
    +

    Whether to enable SSL certificates.

  • @@ -846,7 +864,6 @@ needed.

     
     
    -98
     99
     100
     101
    @@ -920,10 +937,12 @@ needed.

    169 170 171 -172
    +172 +173 +174 -
    # File 'manifests/params.pp', line 98
    +        
    # File 'manifests/params.pp', line 99
     
     class cd_nrpe::params (
     
    @@ -952,7 +971,8 @@ $ne_command_prefix          = '/usr/bin/sudo',
     $ne_command_timeout         = '60',
     $ne_connection_timeout      = '300',
     $ne_allow_weak_rnd_seed     = '1',
    -$ne_ssl_version             = 'TLSv1.1+',
    +$ne_enable_ssl              = false,
    +$ne_ssl_version             = 'TLSv2+',
     $ne_ssl_use_adh             = '1',
     $ne_ssl_cipher_list         = 'ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH',
     $ne_ssl_cacert_file         = '/etc/pki/tls/certs/ca-chain.crt.pem',
    @@ -1007,7 +1027,7 @@ $ne_nrpe_conf_erb           = 'cd_nrpe/nrpe_conf.erb'
     
     
           
    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 14d5eb0..35095ca 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 80eba38..681c968 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 2ef92ef372803b6d7420ec7561cb5e4b212fba38 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 20:33:17 +0200 Subject: [PATCH 3/5] recommit for updates in build 38 --- CHANGELOG.md | 15 +++++++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nrpe.html | 2 +- .../cd_nrpe_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aservice.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 2 +- .../cd_nrpe_3A_3Acommands_3A_3Adefinitions.html | 2 +- doc/top-level-namespace.html | 2 +- 15 files changed, 29 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 482cfd4..5d69140 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

    No issue

    +8dbe3d8b31ce256 Arne Teuke 2017-07-28 18:26:27 +

    +

    updated template

    + +

    +c2e28a255730208 Jenkins Server 2017-07-28 18:26:20 +

    +

    recommit for updates in build 37

    + +

    +259b9d85693d2cf Arne Teuke 2017-07-28 18:22:05 +

    +

    updated template

    + +

    7efec6b6a39fc99 Arne Teuke 2017-07-28 17:57:30

    updated template

    diff --git a/doc/_index.html b/doc/_index.html index 8c6e0e0..b3b7010 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 6ed8e6c..769dce1 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -252,7 +252,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 9884e16..85b7882 100644 --- a/doc/index.html +++ b/doc/index.html @@ -252,7 +252,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index 79668f6..6bf375c 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 978b84c..a327de2 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 6e0eb4a..399fe75 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 fc79645..957d8fe 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 22c7688..e68a11e 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -217,7 +217,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 88fa79f..48ccfb5 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 d3014c4..9932d20 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 0a039dc..fda15e6 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 6584f33..4c72787 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -1027,7 +1027,7 @@ $ne_nrpe_conf_erb = 'cd_nrpe/nrpe_conf.erb' 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 35095ca..dbf107e 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 681c968..aab8d1e 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From f6ce7ebb93b4562e6d3127fb45e308fb81053021 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 20:48:58 +0200 Subject: [PATCH 4/5] recommit for updates in build 39 --- CHANGELOG.md | 10 ++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nrpe.html | 2 +- .../cd_nrpe_3A_3Afirewall_3A_3Aiptables.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 6 +++--- .../cd_nrpe_3A_3Acommands_3A_3Adefinitions.html | 2 +- doc/top-level-namespace.html | 2 +- 15 files changed, 26 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d69140..1fb11fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +ba9e027f7201e79 Arne Teuke 2017-07-28 18:33:24 +

    +

    updated template

    + +

    +2ef92ef372803b6 Jenkins Server 2017-07-28 18:33:17 +

    +

    recommit for updates in build 38

    + +

    8dbe3d8b31ce256 Arne Teuke 2017-07-28 18:26:27

    updated template

    diff --git a/doc/_index.html b/doc/_index.html index b3b7010..8964566 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 769dce1..01984a4 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -252,7 +252,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 85b7882..8e6c045 100644 --- a/doc/index.html +++ b/doc/index.html @@ -252,7 +252,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index 6bf375c..410157f 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 a327de2..7fe88be 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 399fe75..18beb3f 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 957d8fe..6722b4f 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 e68a11e..a077bf9 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -217,7 +217,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 48ccfb5..569934b 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 9932d20..ca45c30 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 fda15e6..5ae5249 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 4c72787..108b02f 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -783,7 +783,7 @@ needed.

    (string) - (defaults to: '127.0.0.1') + (defaults to: '0.0.0.0') — @@ -961,7 +961,7 @@ $ne_log_facility = 'daemon', $ne_log_file = '', $ne_debug = '0', $ne_nrpe_port = '5666', -$ne_server_address = '127.0.0.1', +$ne_server_address = '0.0.0.0', $ne_listen_queue_size = '5', $ne_nagios_server = $::nagios_server, $ne_dont_blame_nrpe = '1', @@ -1027,7 +1027,7 @@ $ne_nrpe_conf_erb = 'cd_nrpe/nrpe_conf.erb' 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 dbf107e..1259313 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 aab8d1e..37c14d3 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 3f047c24ddbd6ed17b24c9db3b6e8c812b861296 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 30 Jul 2017 13:32:22 +0200 Subject: [PATCH 5/5] recommit for updates in build 40 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 5 +- doc/_index.html | 7 +- doc/file.README.html | 26 ++- doc/index.html | 26 ++- doc/puppet_class_list.html | 23 +- doc/puppet_classes/cd_nrpe.html | 2 +- ...d_nrpe_3A_3Acommands_3A_3Adefinitions.html | 217 ++++++++++++++++++ .../cd_nrpe_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aservice.html | 12 +- .../cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 42 +++- ...d_nrpe_3A_3Acommands_3A_3Adefinitions.html | 118 ++++++++-- doc/top-level-namespace.html | 2 +- 18 files changed, 456 insertions(+), 46 deletions(-) create mode 100644 doc/puppet_classes/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fb11fc..a74e84c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +93c4d60d239af95 Arne Teuke 2017-07-28 18:49:03 +

    +

    updated parameter

    + +

    +f6ce7ebb93b4562 Jenkins Server 2017-07-28 18:48:58 +

    +

    recommit for updates in build 39

    + +

    ba9e027f7201e79 Arne Teuke 2017-07-28 18:33:24

    updated template

    diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 1d1d052..6a2728d 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -31,6 +31,7 @@ | `-- top-level-namespace.html |-- manifests | |-- commands +| | |-- definition_rules.pp | | `-- definitions.pp | |-- firewall | | `-- iptables.pp @@ -44,6 +45,8 @@ | |-- init.pp | `-- params.pp |-- templates +| |-- cmd_head.erb +| |-- cmd_rule.erb | |-- nrpe_cfg.erb | `-- nrpe_conf.erb |-- tests @@ -56,4 +59,4 @@ |-- README.md `-- REPOSTRUCTURE.md -11 directories, 45 files +11 directories, 48 files diff --git a/doc/_index.html b/doc/_index.html index 8964566..a8ac6d3 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,6 +73,11 @@ +
  • + cd_nrpe::commands::definitions + +
  • +
  • cd_nrpe::firewall::iptables @@ -166,7 +171,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 01984a4..ef75084 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -61,7 +61,7 @@

    |Repo Name| version | Build Status| |---|---|---|---| -|cd_nrpe| 0.0.0.1 | cd_nrpe| 0.0.0.2 | {Build Status/]|

    @@ -101,6 +101,8 @@ Structure

  • Parameters

  • +

    Managing Check Commands

    +
  • SELINUX

  • Known Problems

    @@ -192,6 +194,26 @@ details about class deployment on Confdroid.com.

    (recommended). Values changed will take immediate effect at next puppet run. Services will be restarted where neccessary.

    +

    Mandatory Parameters

    + +

    There are currently no mandatory parameters, i.e. the module will function +right out of box as is.

    + +

    Optional Parameters

    +
    • +

      $ne_manage_cmds : Whether to manage check command definitions +dynamically through a define, i.e. from other Puppet modules or profiles. +Defaults to true.

      +
    • +

      $ne_incl_fw : Whether to manage relevant firewall rules +through this modules. Defaults to true.

      +
    • +

      $ne_include_selinux : Whether to manage selinux exception +rules. Defaults to true.

      +
    + +

    Managing Check Commands

    +

    SELINUX

    All files and directories are configured with correct selinux context. If @@ -252,7 +274,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 8e6c045..2859e90 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

    |Repo Name| version | Build Status| |---|---|---|---| -|cd_nrpe| 0.0.0.1 | cd_nrpe| 0.0.0.2 | {Build Status/]|

    @@ -101,6 +101,8 @@ Structure

  • Parameters

  • +

    Managing Check Commands

    +
  • SELINUX

  • Known Problems

    @@ -192,6 +194,26 @@ details about class deployment on Confdroid.com.

    (recommended). Values changed will take immediate effect at next puppet run. Services will be restarted where neccessary.

    +

    Mandatory Parameters

    + +

    There are currently no mandatory parameters, i.e. the module will function +right out of box as is.

    + +

    Optional Parameters

    +
    • +

      $ne_manage_cmds : Whether to manage check command definitions +dynamically through a define, i.e. from other Puppet modules or profiles. +Defaults to true.

      +
    • +

      $ne_incl_fw : Whether to manage relevant firewall rules +through this modules. Defaults to true.

      +
    • +

      $ne_include_selinux : Whether to manage selinux exception +rules. Defaults to true.

      +
    + +

    Managing Check Commands

    +

    SELINUX

    All files and directories are configured with correct selinux context. If @@ -252,7 +274,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index aaf8948..8abae00 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -47,56 +47,63 @@
  • -
  • +
  • + +
  • + + +
  • -
  • +
  • -
  • +
  • -
  • +
  • -
  • +
  • -
  • +
  • -
  • +
  • -
  • +
  • diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index 410157f..e64569b 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_3Acommands_3A_3Adefinitions.html b/doc/puppet_classes/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html new file mode 100644 index 0000000..2ff5c4a --- /dev/null +++ b/doc/puppet_classes/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html @@ -0,0 +1,217 @@ + + + + + + + Puppet Class: cd_nrpe::commands::definitions + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + + + +
    + + +

    Puppet Class: cd_nrpe::commands::definitions

    +
    + +
    +
    Inherits:
    +
    cd_nrpe::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/commands/definition_rules.pp +
    +
    +
    + +

    Summary

    + manage command definitions via define and Puppet rules. + +

    Overview

    +
    +
    + +

    cd_nrpe::commands::definition_rules.pp +Module name: cd_nrpe +Author: Arne +Teuke (arne_teuke@ConfDroid.com)

    + +

    License:

    + +

    This file is part of cd_nrpe.

    + +

    cd_nrpe is used for providing automatic configuration of NRPE. + Copyright +(C) 2016 ConfDroid (copyright@ConfDroid.com) + This program is free +software: you can redistribute it and/or modify + it under the terms of the +GNU General Public License as published by + the Free Software Foundation, +either version 3 of the License, or + (at your option) any later version.

    + +

    This program is distributed in the hope that it will be useful, + but +WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License +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/.

    + +
    +
    +
    + + +
    + + + + + +
    +
    +
    +
    +23
    +24
    +25
    +26
    +27
    +28
    +29
    +30
    +31
    +32
    +33
    +34
    +35
    +36
    +37
    +38
    +39
    +40
    +41
    +42
    +43
    +44
    +45
    +46
    +47
    +48
    +49
    +50
    +51
    +52
    +53
    +54
    +55
    +56
    +
    +
    # File 'manifests/commands/definition_rules.pp', line 23
    +
    +class cd_nrpe::commands::definitions (
    +
    +) inherits cd_nrpe::params {
    +
    +  if $ne_manage_cmds == true {
    +
    +    # manage the commands.cfg file
    +
    +    concat { $ne_cmd_file:
    +      ensure    =>  present,
    +      path      =>  $ne_cmd_file,
    +      owner     =>  'root',
    +      group     =>  'root',
    +      mode      =>  '0640',
    +      selrange  =>  s0,
    +      selrole   =>  object_r,
    +      seltype   =>  nrpe_etc_t,
    +      seluser   =>  system_u,
    +      notify    =>  Service[$ne_service],
    +    }
    +
    +    # manage the file header
    +
    +    concat::fragment { 'nrpe_cmd_header':
    +      target    =>  $ne_cmd_file,
    +      content   =>  template($ne_cmd_head_erb),
    +      order     =>  '000',
    +    }
    +
    +    # basic example rules
    +
    +
    +  }
    +}
    +
    +
    +
    + + + +
    + + \ No newline at end of file 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 7fe88be..673bf90 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 18beb3f..d06006e 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 6722b4f..89d3b54 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 a077bf9..ac70562 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -217,7 +217,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 569934b..1f11506 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 ca45c30..8fbc8c4 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html @@ -145,7 +145,11 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    37 38 39 -40
  • +40 +41 +42 +43 +44
    # File 'manifests/main/service.pp', line 23
    @@ -160,6 +164,10 @@ class cd_nrpe::main::service (
     
       require cd_nrpe::main::files
     
    +  if $ne_manage_cmds == true {
    +    require cd_nrpe::commands::definition_rules
    +  }
    +
       service { $ne_service:
         ensure      => running,
         hasstatus   => true,
    @@ -175,7 +183,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 5ae5249..0d15279 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 108b02f..6c13781 100644
    --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
    +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
    @@ -81,6 +81,8 @@
           
           cd_nrpe::firewall::iptables
    + cd_nrpe::commands::definitions
    + @@ -843,6 +845,26 @@ needed.

    Whether to enable SSL certificates.

    +
    + + + +
  • + + ne_manage_cmds + + + (boolean) + + + (defaults to: true) + + + — +
    +

    Whether to manage command rules for NRPE +checks, to allow dynamic check +& command rules.

  • @@ -864,8 +886,6 @@ needed.

     
     
    -99
    -100
     101
     102
     103
    @@ -939,15 +959,24 @@ needed.

    171 172 173 -174
    +174 +175 +176 +177 +178 +179 +180 +181
    -
    # File 'manifests/params.pp', line 99
    +        
    # File 'manifests/params.pp', line 101
     
     class cd_nrpe::params (
     
     $pkg_ensure                 = 'latest',
     
    +$ne_manage_cmds             = true,
    +
     # user settings
     $ne_user                    = 'nrpe',
     $ne_user_comment            = 'NRPE service user',
    @@ -1014,6 +1043,9 @@ $ne_main_conf_erb           = 'cd_nrpe/nrpe_cfg.erb'
     $ne_nrpe_pid_file           = "${ne_run_dir}/nrpe.pid"
     $ne_nrpe_conf_file          = '/etc/sysconfig/nrpe'
     $ne_nrpe_conf_erb           = 'cd_nrpe/nrpe_conf.erb'
    +$ne_cmd_file                = "${ne_main_conf_d_dir}/commands.cfg"
    +$ne_cmd_head_erb            = 'cd_nrpe/cmd_head.erb'
    +$ne_cmd_rule_erb            = 'cd_nrpe/cmd_rule.erb'
     
     # includes must be last
     
    @@ -1027,7 +1059,7 @@ $ne_nrpe_conf_erb           = 'cd_nrpe/nrpe_conf.erb'
     
     
           
    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 1259313..950e7c9 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
    @@ -70,7 +70,8 @@
     
     
       

    Summary

    - manage firewall settings through cd_firewall or puppetlabs-firewall + Populate command definitions through external puppet rules, i.e. +from other modules.

    Overview

    @@ -112,7 +113,72 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    +

    Parameters:

    +
      +
    • + + ne_check_cmd + + + (string) + + + (defaults to: undef) + + + — +
      +

      Specify the check_command to use.

      +
      + +
    • + +
    • + + ne_cmd_path + + + (string) + + + (defaults to: '/usr/lib64/nagios/plugins/') + + + — +
      +

      The path to the command scripts, usually +where the nagis_plugins are +located. If you use your own scripts, specify +the custom location +including the trailing slash

      +
      + +
    • + +
    • + + ne_cmd_argstring + + + (Any) + + + (defaults to: undef) + + + — +
      +

      Specify the string of valid argument for the command +, i.e. -w $ARG1$ -c +$ARG2$. See the arguments in th eman pages for the +checks.

      +
      + +
    • + +
    +
    @@ -121,26 +187,44 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

     
     
    -23
    -24
    -25
    -26
    -27
    -28
    -29
    -30
    +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47
    -
    # File 'manifests/commands/definitions.pp', line 23
    +        
    # File 'manifests/commands/definitions.pp', line 31
     
    -define cd_nrpe::commands::definitions (
    +define cd_nrpe::commands::definitions (
    +
    +$ne_check_cmd     = undef,
    +$ne_cmd_path      = '/usr/lib64/nagios/plugins/',
    +$ne_cmd_argstring = undef,
    +
    +) {
    +
    +$ne_cmd_file      = $::cd_nrpe::params::ne_cmd_file
    +$ne_cmd_rule_erb  = $::cd_nrpe::params::ne_cmd_rule_erb
     
     
    -) {
    -
    -
    -
    -}
    + concat::fragment { $name: + target => $ne_cmd_file, + content => template($ne_cmd_rule_erb), + } +}
    @@ -148,7 +232,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 37c14d3..b43168c 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@