diff --git a/CHANGELOG.md b/CHANGELOG.md index 1de8e3f..484674c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,14 @@ Changelog of Git Changelog.

No issue

-8db8758970310bf Arne Teuke 2017-07-20 13:31:19 +3a3e3ceef9a4a2f Jenkins Server 2017-07-20 13:47:46

-

recommitting to see if git can be fixed

+

recommit for updates in build 2

+ +

+febc8f1a348f2e7 Arne Teuke 2017-07-20 13:47:24 +

+

re-added all files

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 12e4ae8..89b1b11 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -1,4 +1,34 @@ . +|-- doc +| |-- css +| | |-- common.css +| | |-- full_list.css +| | `-- style.css +| |-- js +| | |-- app.js +| | |-- full_list.js +| | `-- jquery.js +| |-- puppet_classes +| | |-- cd_nagios_3A_3Afirewall_3A_3Aiptables.html +| | |-- cd_nagios_3A_3Amain_3A_3Aconfig.html +| | |-- cd_nagios_3A_3Amain_3A_3Adirs.html +| | |-- cd_nagios_3A_3Amain_3A_3Ainstall.html +| | |-- cd_nagios_3A_3Amain_3A_3Auser.html +| | |-- cd_nagios_3A_3Aparams.html +| | |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html +| | |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +| | |-- cd_nagios_3A_3Aserver_3A_3Afiles.html +| | |-- cd_nagios_3A_3Aserver_3A_3Aservice.html +| | `-- cd_nagios.html +| |-- puppet_defined_types +| | `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html +| |-- file.README.html +| |-- frames.html +| |-- _index.html +| |-- index.html +| |-- puppet_class_list.html +| |-- puppet_defined_type_list.html +| `-- top-level-namespace.html |-- manifests | |-- client | | `-- target.pp @@ -25,10 +55,14 @@ | | `-- htpasswd_rule.erb | `-- selinux | `-- taccgi.erb +|-- tests +| `-- UTF_Files +|-- CHANGELOG.md |-- Gemfile |-- Gemfile.lock |-- Jenkinsfile |-- LICENSE -`-- README.md +|-- README.md +`-- REPOSTRUCTURE.md -9 directories, 22 files +15 directories, 50 files diff --git a/doc/_index.html b/doc/_index.html index af1095e..e9b86ae 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 ea1a390..9421163 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 f744c74..4e7d075 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 dc07105..beb715e 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 ac65ab4..e34cbe0 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 723a1f0..53d6f00 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 5790533..f839d0c 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 0e64841..a8fdf25 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 a79da72..488947e 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 3722574..d4e9cf2 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 bf69296..ca45ae8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -169,7 +169,7 @@ class cd_nagios::selinux::config ( command => template($ng_taccgi_erb), path => ['/usr/bin','/usr/sbin'], cwd => '/tmp', - creates => '/tmp/my-taccgi', + creates => '/tmp/my-taccgi.pp', notify => Exec['semodule_taccgi'], } @@ -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 420585a..65004dc 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 @@ -166,7 +166,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

51 52 53 -54 +54 +55 
# File 'manifests/server/access_rules.pp', line 28
@@ -189,6 +190,7 @@ class cd_nagios::server::access_rules (
       selrole   =>  object_r,
       seltype   =>  nagios_etc_t,
       seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
     }
 
     concat::fragment { 'create_header':
@@ -205,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 c02ed79..4bfb3fd 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 94c88ce..f4568cc 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 38774d9..f052efb 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,8 +169,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

 37
 38
 39
-40
-41
+40 
# File 'manifests/server/access.pp', line 23
@@ -191,7 +190,6 @@ $ng_service       = $::cd_nagios::params::ng_service
   concat::fragment { $name:
     target  =>  $ng_htpasswd_file,
     content =>  template($ng_htpasswd_rule),
-    notify  =>  Service[$ng_service],
   }
 }
@@ -201,7 +199,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 3378389..ccada17 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ diff --git a/manifests/selinux/config.pp b/manifests/selinux/config.pp index ed19da9..b2516a3 100644 --- a/manifests/selinux/config.pp +++ b/manifests/selinux/config.pp @@ -32,7 +32,7 @@ class cd_nagios::selinux::config ( command => template($ng_taccgi_erb), path => ['/usr/bin','/usr/sbin'], cwd => '/tmp', - creates => '/tmp/my-taccgi', + creates => '/tmp/my-taccgi.pp', notify => Exec['semodule_taccgi'], } diff --git a/manifests/server/access.pp b/manifests/server/access.pp index 947a077..7e01498 100644 --- a/manifests/server/access.pp +++ b/manifests/server/access.pp @@ -36,6 +36,5 @@ $ng_service = $::cd_nagios::params::ng_service concat::fragment { $name: target => $ng_htpasswd_file, content => template($ng_htpasswd_rule), - notify => Service[$ng_service], } } diff --git a/manifests/server/access_rules.pp b/manifests/server/access_rules.pp index 81da2c3..07668f4 100644 --- a/manifests/server/access_rules.pp +++ b/manifests/server/access_rules.pp @@ -43,6 +43,7 @@ class cd_nagios::server::access_rules ( selrole => object_r, seltype => nagios_etc_t, seluser => system_u, + notify => Service[$ng_service], } concat::fragment { 'create_header':