From 4c9cff0e73d216c90a8737d6bfcc7dbebdf6baa6 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 20 Jul 2017 15:45:54 +0100 Subject: [PATCH 1/2] added check for nagios_server to access --- manifests/server/access.pp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/manifests/server/access.pp b/manifests/server/access.pp index 7e01498..6637997 100644 --- a/manifests/server/access.pp +++ b/manifests/server/access.pp @@ -27,14 +27,19 @@ $ng_htpasswd_password = undef, ) { +$ng_nagios_server = $::cd_nagios::params::ng_nagios_server $ng_htpasswd_file = $::cd_nagios::params::ng_htpasswd_file $ng_htpasswd_rule = $::cd_nagios::params::ng_htpasswd_rule $ng_service = $::cd_nagios::params::ng_service - # create password rules - concat::fragment { $name: - target => $ng_htpasswd_file, - content => template($ng_htpasswd_rule), + if $::fqdn == $ng_nagios_server { + + # create password rules + + concat::fragment { $name: + target => $ng_htpasswd_file, + content => template($ng_htpasswd_rule), + } } } From 84a42a16a33cd80d69d46221f097ff52c3f26ff5 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 16:46:15 +0200 Subject: [PATCH 2/2] recommit for updates in build 4 --- CHANGELOG.md | 15 +++++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 22 ++++++++++++++----- doc/top-level-namespace.html | 2 +- 17 files changed, 46 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 484674c..d7f351f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+030e5f68f509f71 Jenkins Server 2017-07-20 14:11:13 +

+

recommit for updates in build 3

+ +

+8a14684ca214be5 Arne Teuke 2017-07-20 14:10:54 +

+

changed creates rule for exec

+ +

+cb2010e7d20dcc6 Arne Teuke 2017-07-20 14:09:11 +

+

moved service dependency to access_rules

+ +

3a3e3ceef9a4a2f Jenkins Server 2017-07-20 13:47:46

recommit for updates in build 2

diff --git a/doc/_index.html b/doc/_index.html index e9b86ae..29129a0 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 9421163..28527bf 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 4e7d075..609f6cf 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index beb715e..fee5196 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index e34cbe0..36840d8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 53d6f00..421fbc2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index f839d0c..050d1a4 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index a8fdf25..65d0fd9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 488947e..da0ddf3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index d4e9cf2..2a7d453 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2135,7 +2135,7 @@ $ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index ca45ae8..3686949 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -189,7 +189,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index 65004dc..a21999a 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -207,7 +207,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 4bfb3fd..0add6cd 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -196,7 +196,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index f4568cc..30ef896 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index f052efb..2997627 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -169,7 +169,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

37 38 39 -40 +40 +41 +42 +43 +44 +45 
# File 'manifests/server/access.pp', line 23
@@ -181,15 +186,20 @@ $ng_htpasswd_password = undef,
 
 ) {
 
+$ng_nagios_server = $::cd_nagios::params::ng_nagios_server
 $ng_htpasswd_file = $::cd_nagios::params::ng_htpasswd_file
 $ng_htpasswd_rule = $::cd_nagios::params::ng_htpasswd_rule
 $ng_service       = $::cd_nagios::params::ng_service
 
-  # create password rules
 
-  concat::fragment { $name:
-    target  =>  $ng_htpasswd_file,
-    content =>  template($ng_htpasswd_rule),
+  if $::fqdn == $ng_nagios_server {
+
+    # create password rules
+
+    concat::fragment { $name:
+      target  =>  $ng_htpasswd_file,
+      content =>  template($ng_htpasswd_rule),
+    }
   }
 }
@@ -199,7 +209,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index ccada17..c9dd615 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@