AMBARI-2037. Nagios web not installing as expected on Sles11. (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1476426 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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)
 

ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp

@@ -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_permisssions()
   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"]

ambari-agent/src/main/puppet/modules/hdp-nagios/files/nagios.conf → ambari-agent/src/main/puppet/modules/hdp-nagios/templates/nagios.conf.erb

@@ -26,6 +26,7 @@
 # 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">
@@ -42,6 +43,26 @@ ScriptAlias /nagios/cgi-bin "/usr/lib64/nagios/cgi"
    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"
 

ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp

@@ -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 => {