From fff6edf496b29938c244cbf8758bcafcc3683abb Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 28 Jul 2017 18:06:39 +0100 Subject: [PATCH 1/2] adding dirs --- manifests/main/service.pp | 2 +- manifests/params.pp | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manifests/main/service.pp b/manifests/main/service.pp index dd36bff..b56e826 100644 --- a/manifests/main/service.pp +++ b/manifests/main/service.pp @@ -28,7 +28,7 @@ class cd_nrpe::main::service ( require cd_nrpe::firewall::iptables } - require cd_nrpe::main::user + require cd_nrpe::main::dirs service { $ne_service: ensure => running, diff --git a/manifests/params.pp b/manifests/params.pp index b42c257..95269d5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -43,7 +43,7 @@ # of the form $(...). # @param [boolean] ne_allow_sudo Whether to allow sudo access. used in nrpe.cfg # as well as for creating a sudo role. -# @param [string] command_prefix allows you to prefix all commands with a +# @param [string] ne_command_prefix allows you to prefix all commands with a # user-defined string. # @param [string] ne_incl_fw Whether to include firewall rules # @param [string] ne_command_timeout maximum number of seconds that the NRPE @@ -62,7 +62,7 @@ # authority ( ca) file / chain. must be full path. # @param [string] ne_ssl_cert_file path and name of the server ssl certificate. # must include full path. -# @param [string] ne_ssl_privatekey_filepath and name of the server ssl +# @param [string] ne_ssl_privatekey_file path and name of the server ssl # private key. Must include full path. # @param [string] ne_ssl_client_certs determines client certificate usage. # Values: 0 = Don't ask for or require client certificates @@ -82,10 +82,14 @@ # be passed to the NRPE daemon. # @param [string] ne_include_file include definitions from an external # config file. -# @param [string] ne_include_dir # @param [string] ne_fw_order_no ordering prefix for he firewall rules. Adjust # to your environment if needed. # @param [string] ne_ssl_opts Specify additional SSL options. +# @param [string] ne_user the NRPE service user +# @param [string] ne_user_comment The comment for the service user /etc/passwd +# @param [string] ne_user_uid the UID for the service user +# ~param [string] ne_user_home the home for the service user +# @param [string] ne_user_shell the shell for the service user. ############################################################################### class cd_nrpe::params ( From 3e44f3fecfe10120fcc7fba637384390c39e21d1 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 19:06:32 +0200 Subject: [PATCH 2/2] recommit for updates in build 22 --- 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 | 4 +- .../cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 116 ++++++++---------- ...d_nrpe_3A_3Acommands_3A_3Adefinitions.html | 2 +- doc/top-level-namespace.html | 2 +- 15 files changed, 76 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a17fa9d..f87e8bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+c4c512987a9e30d Arne Teuke 2017-07-28 16:58:53 +

+

adding user

+ +

+57c5bb01cf9a421 Jenkins Server 2017-07-28 16:58:47 +

+

recommit for updates in build 21

+ +

9799202bcdcbd53 Arne Teuke 2017-07-28 16:54:42

troubleshooting service

diff --git a/doc/_index.html b/doc/_index.html index 1289d55..7ed4e31 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 420ae41..e515a68 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 af7eb9c..379a001 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 599d6e2..85be947 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 ea6f14d..1de1568 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 56f4fb8..0f562c5 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 490ef2c..c11b781 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 6f5dd08..e369c16 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 be9cd0e..f9d5593 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 da8a256..51eb16c 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html @@ -158,7 +158,7 @@ class cd_nrpe::main::service ( require cd_nrpe::firewall::iptables } - require cd_nrpe::main::user + require cd_nrpe::main::dirs service { $ne_service: ensure => running, @@ -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 a4df35a..f1a2442 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 c51c4f7..0d2bdf8 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -133,7 +133,8 @@ for more details.

with this program. If not, see www.gnu.org/licenses/. be passed to -the NRPE daemon.

+the NRPE daemon. +~param [string] ne_user_home the home for the service user

@@ -340,12 +341,14 @@ sudo role.

  • - command_prefix + ne_command_prefix (string) + (defaults to: '/usr/bin/sudo') + —
    @@ -517,16 +520,18 @@ must include full path.

  • - ne_ssl_privatekey_filepath + ne_ssl_privatekey_file (string) + (defaults to: "/etc/pki/tls/private/${::fqdn}.key.pem") + —
    -

    and name of the server ssl +

    path and name of the server ssl private key. Must include full path.

    @@ -623,17 +628,6 @@ one config file.

    -
    • - -
  • - - ne_include_dir - - - (string) - - -
  • @@ -679,12 +673,17 @@ needed.

    ne_user - (Any) + (string) (defaults to: 'nrpe') + — +
    +

    the NRPE service user

    +
    +
  • @@ -692,12 +691,17 @@ needed.

    ne_user_comment - (Any) + (string) (defaults to: 'NRPE service user') + — +
    +

    The comment for the service user /etc/passwd

    +
    +
  • @@ -705,12 +709,35 @@ needed.

    ne_user_uid - (Any) + (string) (defaults to: '1005') + — +
    +

    the UID for the service user

    +
    + +
    • + +
  • + + ne_user_shell + + + (string) + + + (defaults to: '/sbin/nologin') + + + — +
    +

    the shell for the service user.

    +
    +
  • @@ -737,19 +764,6 @@ needed.

    (defaults to: undef) -
    • - -
  • - - ne_user_shell - - - (Any) - - - (defaults to: '/sbin/nologin') - -
  • @@ -763,19 +777,6 @@ needed.

    (defaults to: '127.0.0.1') -
    • - -
  • - - ne_command_prefix - - - (Any) - - - (defaults to: '/usr/bin/sudo') - -
  • @@ -789,19 +790,6 @@ needed.

    (defaults to: '1') -
    • - -
  • - - ne_ssl_privatekey_file - - - (Any) - - - (defaults to: "/etc/pki/tls/private/${::fqdn}.key.pem") - -
  • @@ -834,10 +822,6 @@ needed.

     
 
-90
-91
-92
-93
 94
 95
 96
@@ -908,10 +892,14 @@ needed.
    
 161
 162
 163
-164
    +164 +165 +166 +167 +168 - 
    # File 'manifests/params.pp', line 90
+        
    # File 'manifests/params.pp', line 94
 
 class cd_nrpe::params (
 
@@ -995,7 +983,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 0b057aa..fd31bfc 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 2ad2ebe..6dd308c 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@