incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject svn commit: r1476426 - in /incubator/ambari/trunk: ./ ambari-agent/src/main/puppet/modules/hdp-nagios/files/ ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/ ambari-agent/src/main/puppet/modules/hdp-nagios/templates/ ambari-agent/src/main/pup...
Date Fri, 26 Apr 2013 22:37:08 GMT
Author: swagle
Date: Fri Apr 26 22:37:08 2013
New Revision: 1476426

URL: http://svn.apache.org/r1476426
Log:
AMBARI-2037. Nagios web not installing as expected on Sles11. (swagle)

Added:
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/nagios.conf.erb
Removed:
    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/server.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1476426&r1=1476425&r2=1476426&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Apr 26 22:37:08 2013
@@ -793,6 +793,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
  
+ AMBARI-2037. Nagios web not installing as expected on Sles11. (swagle)
+
  AMBARI-1924. Allow for users to customize Ganglia gmetad + gmond user
  accounts. (smohanty)
 

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=1476426&r1=1476425&r2=1476426&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
Fri Apr 26 22:37:08 2013
@@ -113,7 +113,7 @@ class hdp-nagios::server(
       ensure => present,
       owner => $nagios_user,
       group => $nagios_group,
-      source => "puppet:///modules/hdp-nagios/nagios.conf",
+      content => template("hdp-nagios/nagios.conf.erb"),
       mode   => '0644'
     }
 
@@ -259,7 +259,7 @@ class hdp-nagios::server::web_permisssio
   file { "/etc/nagios/htpasswd.users" :
     owner => $hdp-nagios::params::nagios_default_user,
     group => $hdp-nagios::params::nagios_default_group,
-    mode  => '0750'
+    mode  => '0644'
   }
 
   Hdp::Exec[$cmd] -> File["/etc/nagios/htpasswd.users"]

Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/nagios.conf.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/nagios.conf.erb?rev=1476426&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/nagios.conf.erb
(added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/nagios.conf.erb
Fri Apr 26 22:37:08 2013
@@ -0,0 +1,83 @@
+# 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.
+#
+
+<% if scope.function_hdp_template_var("::hdp::params::hdp_os_type") != "suse"%>
+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>
+<% end %>
+
+<% if scope.function_hdp_template_var("::hdp::params::hdp_os_type") == "suse"%>
+ScriptAlias /nagios/cgi-bin "/usr/lib/nagios/cgi"
+
+<Directory "/usr/lib/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>
+<% end %>
+
+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/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1476426&r1=1476425&r2=1476426&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp Fri
Apr 26 22:37:08 2013
@@ -494,7 +494,12 @@ class hdp::params()
     },
 
     nagios-server => {
-      'ALL' => {64 => {'ALL' => 'nagios-3.2.3'}}
+      'ALL' => {
+        64 => {
+            'ALL' => 'nagios-3.2.3',
+            suse => ['nagios-3.2.3','nagios-www-3.2.3']
+          }
+        }
     },
 
     nagios-fping => {



Mime
View raw message