You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/04/15 19:20:26 UTC
svn commit: r1468159 - in /incubator/ambari/trunk: ./
ambari-agent/src/main/puppet/modules/hdp-nagios/files/
ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/
Author: smohanty
Date: Mon Apr 15 17:20:25 2013
New Revision: 1468159
URL: http://svn.apache.org/r1468159
Log:
AMBARI-1934. ambari-agent/src/main/puppet/modules/hdp-nagios/files/nagios.conf. (smohanty)
Added:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/files/nagios.conf
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1468159&r1=1468158&r2=1468159&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Apr 15 17:20:25 2013
@@ -719,6 +719,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1934. Security vulnerability with Ganglia and Nagios. (smohanty)
+
AMBARI-1933. Test failure : testCascadeDeleteStages. (smohanty)
AMBARI-1931. params/run_smoke_test=true is not taking effect. (smohanty)
Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/files/nagios.conf
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/files/nagios.conf?rev=1468159&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/files/nagios.conf (added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/files/nagios.conf Mon Apr 15 17:20:25 2013
@@ -0,0 +1,62 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
+# SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER
+# Last Modified: 11-26-2005
+#
+# This file contains examples of entries that need
+# to be incorporated into your Apache web server
+# configuration file. Customize the paths, etc. as
+# needed to fit your system.
+#
+
+ScriptAlias /nagios/cgi-bin "/usr/lib64/nagios/cgi"
+
+<Directory "/usr/lib64/nagios/cgi">
+# SSLRequireSSL
+ Options ExecCGI
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+# Order deny,allow
+# Deny from all
+# Allow from 127.0.0.1
+ AuthName "Nagios Access"
+ AuthType Basic
+ AuthUserFile /etc/nagios/htpasswd.users
+ Require valid-user
+</Directory>
+
+Alias /nagios "/usr/share/nagios"
+
+<Directory "/usr/share/nagios">
+# SSLRequireSSL
+ Options None
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+# Order deny,allow
+# Deny from all
+# Allow from 127.0.0.1
+ AuthName "Nagios Access"
+ AuthType Basic
+ AuthUserFile /etc/nagios/htpasswd.users
+ Require valid-user
+</Directory>
+
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp?rev=1468159&r1=1468158&r2=1468159&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp Mon Apr 15 17:20:25 2013
@@ -26,6 +26,7 @@ class hdp-nagios::params() inherits hdp:
$nagios_group = hdp_default("nagios_group",$nagios_default_group)
$conf_dir = hdp_default("nagios_conf_dir","/etc/nagios")
+ $httpd_conf_file = "/etc/httpd/conf.d/nagios.conf"
$plugins_dir = "/usr/lib64/nagios/plugins"
$eventhandlers_dir = "/usr/lib64/nagios/eventhandlers" # Does not exist yet
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp?rev=1468159&r1=1468158&r2=1468159&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp Mon Apr 15 17:20:25 2013
@@ -28,6 +28,7 @@ class hdp-nagios::server(
$plugins_dir = $hdp-nagios::params::plugins_dir
$nagios_obj_dir = $hdp-nagios::params::nagios_obj_dir
$check_result_path = $hdp-nagios::params::check_result_path
+ $nagios_httpd_config_file = $hdp-nagios::params::httpd_conf_file
if hdp_is_empty($hdp::params::pathes[nagios_p1_pl]) {
@@ -107,7 +108,15 @@ class hdp-nagios::server(
hdp::user { $nagios_user:
gid => $nagios_group
}
-
+
+ file{ $nagios_httpd_config_file :
+ ensure => present,
+ owner => $nagios_user,
+ group => $nagios_group,
+ source => "puppet:///modules/hdp-nagios/nagios.conf",
+ mode => '0644'
+ }
+
hdp::directory { $nagios_config_dir:
service_state => $service_state,
force => true,