diff --git a/CHANGELOG.md b/CHANGELOG.md index d5eb6b8..e12ad15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,41 @@ Changelog of Git Changelog.

No issue

+4ec7633f976a225 Jenkins Server 2017-07-21 12:51:33 +

+

recommit for updates in build 24

+ +

+5d12bf44374b934 Arne Teuke 2017-07-21 12:51:07 +

+

found format options both for hosts and ips

+ +

+442fd08f623728f Arne Teuke 2017-07-21 12:44:03 +

+

testing options both for hosts and ips

+ +

+b95350b8d8e58b4 Arne Teuke 2017-07-21 12:41:33 +

+

testing options both for hosts and ips

+ +

+a28f890bdde57e2 Arne Teuke 2017-07-21 12:30:09 +

+

testing options both for hosts and ips

+ +

+de3a7fd4fa01415 Arne Teuke 2017-07-21 12:20:44 +

+

testing options both for hosts and ips

+ +

+b37864c7a366aff Arne Teuke 2017-07-21 12:15:47 +

+

testing options both for hosts and ips

+ +

109eea2716be3ae Jenkins Server 2017-07-21 11:35:04

recommit for updates in build 18

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 2b150b5..e7117de 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -51,7 +51,8 @@ | `-- params.pp |-- templates | |-- httpd -| | `-- nagios_conf.erb +| | |-- nagios_conf.erb +| | `-- welcome_conf.erb | |-- nagios | | |-- cgi_cfg.erb | | `-- htpasswd_rule.erb @@ -68,4 +69,4 @@ |-- README.md `-- REPOSTRUCTURE.md -16 directories, 52 files +16 directories, 53 files diff --git a/doc/_index.html b/doc/_index.html index e6c2f23..31ec137 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -181,7 +181,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index d74e1e3..ecd2a0d 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 3b27837..4825303 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 bfcbea5..b3f96c4 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_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 982637c..de0ceec 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 cba9167..927e452 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 be593a1..695a577 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 97786f3..c31c362 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 1880f6f..eb6807c 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 ef0b2b6..ab47287 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 df0dd9e..9c1f3e2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -1854,6 +1854,19 @@ Requires format 'ipaddress ip address range'

+
  • + + ng_disable_welcome + + + (Any) + + + (defaults to: true) + + +
    • + @@ -2028,7 +2041,9 @@ Requires format 'ipaddress ip address range'

    357 358 359 -360 +360 +361 +362 
    # File 'manifests/params.pp', line 203
@@ -2142,7 +2157,7 @@ $ng_use_selinux_tools = true,
 # httpd
 $ng_required_hosts    = '',
 $ng_required_ips      = '127.0.0.0/8',
-
+$ng_disable_welcome   = true,
 ) {
 
 # installation section
@@ -2158,33 +2173,35 @@ $ng_required_ips      = '127.0.0.0/8',
   }
 
 # service
-$ng_service         = 'nagios'
-$ae_service         = 'httpd'
+$ng_service           = 'nagios'
+$ae_service           = 'httpd'
 
 # directories
-$ng_main_dir        = '/etc/nagios'
-$ng_conf_d_dir      = "${ng_main_dir}/conf.d"
-$ng_objects_dir     = "${ng_main_dir}/objects"
-$ng_private_dir     = "${ng_main_dir}/private"
-$ng_usr_incl        = '/usr/include/nagios'
-$ng_lib_dir         = '/usr/lib64/nagios'
-$ng_log_dir         = '/var/log/nagios'
-$ng_log_archives    = "${ng_log_dir}/archives"
-$ng_spool_dir       = '/var/spool/nagios'
-$ng_usr_share       = '/usr/share/nagios'
-$ng_share_html      = "${ng_usr_share}/html"
+$ng_main_dir          = '/etc/nagios'
+$ng_conf_d_dir        = "${ng_main_dir}/conf.d"
+$ng_objects_dir       = "${ng_main_dir}/objects"
+$ng_private_dir       = "${ng_main_dir}/private"
+$ng_usr_incl          = '/usr/include/nagios'
+$ng_lib_dir           = '/usr/lib64/nagios'
+$ng_log_dir           = '/var/log/nagios'
+$ng_log_archives      = "${ng_log_dir}/archives"
+$ng_spool_dir         = '/var/spool/nagios'
+$ng_usr_share         = '/usr/share/nagios'
+$ng_share_html        = "${ng_usr_share}/html"
 
 # files
-$ng_main_config     = "${ng_main_dir}/nagios.cfg"
-$ng_cgi_cfg_file    = "${ng_main_dir}/cgi.cfg"
-$ng_cgi_cfg_erb     = 'cd_nagios/nagios/cgi_cfg.erb'
-$ng_htpasswd_file   = "${ng_main_dir}/passwd"
-$ng_htpasswd_head   = 'cd_nagios/nagios/htpasswd_head.erb'
-$ng_htpasswd_rule   = 'cd_nagios/nagios/htpasswd_rule.erb'
-$ng_taccgi_erb      = 'cd_nagios/selinux/taccgi.erb'
-$ng_statcgi_erb     = 'cd_nagios/selinux/statuscgi.erb'
-$ng_nagios_conf     = '/etc/httpd/conf.d/nagios.conf'
-$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
+$ng_main_config       = "${ng_main_dir}/nagios.cfg"
+$ng_cgi_cfg_file      = "${ng_main_dir}/cgi.cfg"
+$ng_cgi_cfg_erb       = 'cd_nagios/nagios/cgi_cfg.erb'
+$ng_htpasswd_file     = "${ng_main_dir}/passwd"
+$ng_htpasswd_head     = 'cd_nagios/nagios/htpasswd_head.erb'
+$ng_htpasswd_rule     = 'cd_nagios/nagios/htpasswd_rule.erb'
+$ng_taccgi_erb        = 'cd_nagios/selinux/taccgi.erb'
+$ng_statcgi_erb       = 'cd_nagios/selinux/statuscgi.erb'
+$ng_nagios_conf       = '/etc/httpd/conf.d/nagios.conf'
+$ng_nagios_conf_erb   = 'cd_nagios/httpd/nagios_conf.erb'
+$ng_welcome_conf      ='/etc/httpd/conf.d/welcome.conf'
+$ng_welcome_conf_erb  = 'cd_nagios/httpd/welcome_conf.erb'
 
 # includes must be last
 
@@ -2198,7 +2215,7 @@ $ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.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 45c3e5b..83dbfd3 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 a6e798e..f11c02f 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 7d514c3..5cc4475 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -172,7 +172,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 63
 64
 65
-66
    +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 
    # File 'manifests/server/files.pp', line 23
@@ -219,6 +238,25 @@ class cd_nagios::server::files (
       content   =>  template($ng_nagios_conf_erb),
       notify    =>  Service[$ae_service],
     }
+
+    # manage index.gtml for nagios web server
+
+    if $ng_disable_welcome == true {
+
+      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),
+        notify    =>  Service[$ae_service],
+      }
+    }
   }
 }
    @@ -228,7 +266,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 2781660..0b6ca03 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 8b98fda..af0a928 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 b8dd2dc..77f1e8d 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ diff --git a/manifests/params.pp b/manifests/params.pp index 2a1adee..669ed5c 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -309,7 +309,7 @@ $ng_use_selinux_tools = true, # httpd $ng_required_hosts = '', $ng_required_ips = '127.0.0.0/8', - +$ng_disable_welcome = true, ) { # installation section @@ -325,33 +325,35 @@ $ng_required_ips = '127.0.0.0/8', } # service -$ng_service = 'nagios' -$ae_service = 'httpd' +$ng_service = 'nagios' +$ae_service = 'httpd' # directories -$ng_main_dir = '/etc/nagios' -$ng_conf_d_dir = "${ng_main_dir}/conf.d" -$ng_objects_dir = "${ng_main_dir}/objects" -$ng_private_dir = "${ng_main_dir}/private" -$ng_usr_incl = '/usr/include/nagios' -$ng_lib_dir = '/usr/lib64/nagios' -$ng_log_dir = '/var/log/nagios' -$ng_log_archives = "${ng_log_dir}/archives" -$ng_spool_dir = '/var/spool/nagios' -$ng_usr_share = '/usr/share/nagios' -$ng_share_html = "${ng_usr_share}/html" +$ng_main_dir = '/etc/nagios' +$ng_conf_d_dir = "${ng_main_dir}/conf.d" +$ng_objects_dir = "${ng_main_dir}/objects" +$ng_private_dir = "${ng_main_dir}/private" +$ng_usr_incl = '/usr/include/nagios' +$ng_lib_dir = '/usr/lib64/nagios' +$ng_log_dir = '/var/log/nagios' +$ng_log_archives = "${ng_log_dir}/archives" +$ng_spool_dir = '/var/spool/nagios' +$ng_usr_share = '/usr/share/nagios' +$ng_share_html = "${ng_usr_share}/html" # files -$ng_main_config = "${ng_main_dir}/nagios.cfg" -$ng_cgi_cfg_file = "${ng_main_dir}/cgi.cfg" -$ng_cgi_cfg_erb = 'cd_nagios/nagios/cgi_cfg.erb' -$ng_htpasswd_file = "${ng_main_dir}/passwd" -$ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb' -$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb' -$ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb' -$ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb' -$ng_nagios_conf = '/etc/httpd/conf.d/nagios.conf' -$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb' +$ng_main_config = "${ng_main_dir}/nagios.cfg" +$ng_cgi_cfg_file = "${ng_main_dir}/cgi.cfg" +$ng_cgi_cfg_erb = 'cd_nagios/nagios/cgi_cfg.erb' +$ng_htpasswd_file = "${ng_main_dir}/passwd" +$ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb' +$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb' +$ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb' +$ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb' +$ng_nagios_conf = '/etc/httpd/conf.d/nagios.conf' +$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb' +$ng_welcome_conf ='/etc/httpd/conf.d/welcome.conf' +$ng_welcome_conf_erb = 'cd_nagios/httpd/welcome_conf.erb' # includes must be last diff --git a/manifests/server/files.pp b/manifests/server/files.pp index 16a5c47..552fdd3 100644 --- a/manifests/server/files.pp +++ b/manifests/server/files.pp @@ -62,5 +62,24 @@ class cd_nagios::server::files ( content => template($ng_nagios_conf_erb), notify => Service[$ae_service], } + + # manage index.gtml for nagios web server + + if $ng_disable_welcome == true { + + 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), + notify => Service[$ae_service], + } + } } } diff --git a/templates/httpd/welcome_conf.erb b/templates/httpd/welcome_conf.erb new file mode 100644 index 0000000..8a7646b --- /dev/null +++ b/templates/httpd/welcome_conf.erb @@ -0,0 +1,27 @@ +################################################################################ +########### welcome.conf generated by Puppet ########## +########### manual changes will be overwritten !!! ########## +################################################################################ + +# +# This configuration file enables the default "Welcome" page if there +# is no default index page present for the root URL. To disable the +# Welcome page, comment out all the lines below. +# +# NOTE: if this file is removed, it will be restored on upgrades. +# +# +# Options -Indexes +# ErrorDocument 403 /.noindex.html +# + +# +# AllowOverride None +# Require all granted +# + +#Alias /.noindex.html /usr/share/httpd/noindex/index.html +#Alias /noindex/css/bootstrap.min.css /usr/share/httpd/noindex/css/bootstrap.min.css +#Alias /noindex/css/open-sans.css /usr/share/httpd/noindex/css/open-sans.css +#Alias /images/apache_pb.gif /usr/share/httpd/noindex/images/apache_pb.gif +#Alias /images/poweredby.png /usr/share/httpd/noindex/images/poweredby.png