diff --git a/CHANGELOG.md b/CHANGELOG.md index 39e3fb0..5dd4b07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+f8530f8c1ae8a22 Jenkins Server 2017-07-23 11:49:19 +

+

recommit for updates in build 61

+ +

+382b1988f25b19b Arne Teuke 2017-07-23 11:49:04 +

+

added nagios directories

+ +

9920bc9caa7325b Jenkins Server 2017-07-23 11:38:25

recommit for updates in build 60

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 9dd9829..d728652 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -62,8 +62,7 @@ | | |-- forward_conf.erb | | |-- index_html.erb | | |-- nagios_conf.erb -| | |-- nagios_ssl_vhost.erb -| | `-- welcome_conf.erb +| | `-- nagios_ssl_vhost.erb | |-- nagios | | |-- cgi_cfg.erb | | `-- htpasswd_rule.erb @@ -80,4 +79,4 @@ |-- README.md `-- REPOSTRUCTURE.md -18 directories, 62 files +18 directories, 61 files diff --git a/doc/_index.html b/doc/_index.html index 10a106d..8ae5537 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -186,7 +186,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 24645dd..1f32339 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -326,7 +326,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index a916484..503a36d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -326,7 +326,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 42051a7..098e661 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_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index 9c291c1..2b22f01 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 371091e..ffe5ef5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( 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 96f0d94..cc5de4e 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 9e52df1..d08aed3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,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 49f6cb0..25e4240 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 0c780d4..ac152c0 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 dd04c91..6153608 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 4a3977c..228d1bc 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2356,7 +2356,7 @@ $ng_certbot_live = "${ng_certbot_main_dir}/live" 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 8e64b53..d9ad1a7 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -249,7 +249,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 effaa40..e13d72e 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 @@ -195,7 +195,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 4c96f5f..df097a7 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -220,32 +220,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

111 112 113 -114 -115 -116 -117 -118 -119 -120 -121 -122 -123 -124 -125 -126 -127 -128 -129 -130 -131 -132 -133 -134 -135 -136 -137 -138 -139 +114 
# File 'manifests/server/files.pp', line 23
@@ -283,11 +258,25 @@ class cd_nagios::server::files (
       notify    =>  Service[$ng_service],
     }
 
-    # manage nagios.conf for httpd
+#    # manage nagios.conf for httpd
 
-    file { $ng_nagios_conf:
+#    file { $ng_nagios_conf:
+#      ensure    =>  file,
+#      path      =>  $ng_nagios_conf,
+#      owner     =>  'root',
+#      group     =>  'root',
+#      mode      =>  '0644',
+#      selrange  =>  s0,
+#      selrole   =>  object_r,
+#      seltype   =>  httpd_config_t,
+#      seluser   =>  system_u,
+#      content   =>  template($ng_nagios_conf_erb),
+#      notify    =>  Service[$ae_service],
+#    }
+
+    file { $ng_forward_conf:
       ensure    =>  file,
-      path      =>  $ng_nagios_conf,
+      path      =>  $ng_forward_conf,
       owner     =>  'root',
       group     =>  'root',
       mode      =>  '0644',
@@ -295,28 +284,14 @@ class cd_nagios::server::files (
       selrole   =>  object_r,
       seltype   =>  httpd_config_t,
       seluser   =>  system_u,
-      content   =>  template($ng_nagios_conf_erb),
-      notify    =>  Service[$ae_service],
-    }
-
-    # manage welcome.conf for nagios web server
-
-    file { $ng_welcome_conf:
-      ensure    =>  file,
-      path      =>  $ng_welcome_conf,
-      owner     =>  'root',
-      group     =>  'root',
-      mode      =>  '0644',
-      selrange  =>  s0,
-      selrole   =>  object_r,
-      seltype   =>  httpd_config_t,
-      seluser   =>  system_u,
-      content   =>  template($ng_welcome_conf_erb),
+      content   =>  template($ng_forward_conf_erb),
       notify    =>  Service[$ae_service],
     }
 
     if $ng_use_https == true {
 
+      # create ssl vhost
+
       file { $ng_ssl_vhost_file:
         ensure    =>  file,
         path      =>  $ng_ssl_vhost_file,
@@ -330,39 +305,14 @@ class cd_nagios::server::files (
         content   =>  template($ng_ssl_vhost_erb),
         notify    =>  Service[$ae_service],
       }
-
-      if $ng_http_https_fw == true {
-
-        file { $ng_forward_conf:
-          ensure    =>  file,
-          path      =>  $ng_forward_conf,
-          owner     =>  'root',
-          group     =>  'root',
-          mode      =>  '0644',
-          selrange  =>  s0,
-          selrole   =>  object_r,
-          seltype   =>  httpd_config_t,
-          seluser   =>  system_u,
-          content   =>  template($ng_forward_conf_erb),
-          notify    =>  Service[$ae_service],
-        }
-      }
     }
 
-    if $ng_enable_index == true {
+    if $ng_use_https != true {
 
-      file { $ng_index_html_file:
-        ensure    =>  file,
-        path      =>  $ng_index_html_file,
-        owner     =>  'root',
-        group     =>  'root',
-        mode      =>  '0644',
-        selrange  =>  s0,
-        selrole   =>  object_r,
-        seltype   =>  httpd_sys_content_t,
-        seluser   =>  system_u,
-        content   =>  template($ng_index_html_erb),
-        notify    =>  Service[$ae_service],
+      # remove ssl_vhost
+
+      file { $ng_ssl_vhost_file:
+        ensure  =>   absent,
       }
     }
   }
@@ -374,7 +324,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 ba9c019..4b6cb46 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 1ff07fc..f6dacf4 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
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 29e2c6b..3e0fcca 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@