diff --git a/CHANGELOG.md b/CHANGELOG.md index 985c202..e18ec1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.
+
+
CONFIGURATION * manage NRPE service user properties * manage directory -structure (file system permissions, selinux context) -*
+structure (file system permissions, selinux context) through parameters +* +manage configuration files through parameters: + * nrpe.conf + * nrpe.cfg +* +manage iptables (optionals ) -SERVICE
+SERVICE +* manage NRPE service
cd_firewall +or puppetlabs +firewall to manage iptables
+cd_stdlib or puppetlabs stdlib to facilitate concat
@@ -241,7 +252,7 @@ environments. diff --git a/doc/index.html b/doc/index.html index 01951f1..08cefd5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -125,10 +125,16 @@ href="https://gitlab.puppetsoft.com/12WW1160/cd_nrpe/blob/master/CHANGELOG.md">CCONFIGURATION * manage NRPE service user properties * manage directory -structure (file system permissions, selinux context) -*
+structure (file system permissions, selinux context) through parameters +* +manage configuration files through parameters: + * nrpe.conf + * nrpe.cfg +* +manage iptables (optionals ) -SERVICE
+SERVICE +* manage NRPE service
cd_firewall +or puppetlabs +firewall to manage iptables
+cd_stdlib or puppetlabs stdlib to facilitate concat
@@ -241,7 +252,7 @@ environments. diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index 96c59e2..606dcc3 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 679b0a3..844f507 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 098179a..4cbbeff 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 fb022fe..e06fc36 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 56c35ef..6d61b3b 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -148,7 +148,25 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/. 40 41 42 -43 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61# File 'manifests/main/files.pp', line 23 @@ -159,6 +177,8 @@ class cd_nrpe::main::files ( require cd_nrpe::main::dirs + # manage /etc/nagios/nrpe.cfg + file { $ne_main_conf_file: ensure => file, path => $ne_main_conf_file, @@ -169,6 +189,22 @@ class cd_nrpe::main::files ( selrole => object_r, seltype => nrpe_etc_t, seluser => system_u, + content => template($ne_main_conf_erb), + notify => Service[$ne_service], + } + + # manage /etc/sysconfig/nrpe + + file { $ne_nrpe_conf_file: + ensure => file, + path => $ne_nrpe_conf_file, + owner => 'root', + group => 'root', + mode => '0640', + selrange => s0, + selrole => object_r, + seltype => etc_t, + seluser => system_u, content => template($ne_nrpe_conf_erb), notify => Service[$ne_service], } @@ -181,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 6f20982..22abf01 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 a173f83..b01188b 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::files + require cd_nrpe::main::install 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 2197dda..bfd8460 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 2b6c232..0e6abe2 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -596,7 +596,7 @@ one (string) - (defaults to: '\"|`&><\'\\[]{};\r\n\"') + (defaults to: '"|`&><\'\\[]{};\r\n\"') — @@ -906,7 +906,9 @@ needed. 159 160 161 -162+162 +163 +164
# File 'manifests/params.pp', line 90 @@ -946,7 +948,7 @@ $ne_ssl_cert_file = "/etc/pki/tls/certs/${::fqdn}.crt.pem", $ne_ssl_privatekey_file = "/etc/pki/tls/private/${::fqdn}.key.pem", $ne_ssl_client_certs = '2', $ne_ssl_logging = '0x00', -$ne_nasty_metachars = '\"|`&><\'\\[]{};\r\n\"', +$ne_nasty_metachars = '"|`&><\'\\[]{};\r\n\"', $ne_include_file = '', # nrpe.conf @@ -976,8 +978,10 @@ $ne_run_dir = '/var/run/nrpe' # files $ne_main_conf_file = '/etc/nagios/nrpe.cfg' -$ne_nrpe_conf_erb = 'cd_nrpe/nrpe_cfg.erb' +$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' # includes must be last @@ -991,7 +995,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 8b327cb..673561d 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 e968ea0..d5fbf46 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@