Browse Source

AMBARI-6433. On Ubuntu should redirect from /nagios to /nagios3 (aonishuk)

Andrew Onishuk 11 years ago
parent
commit
f109887bb4

+ 2 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py

@@ -162,6 +162,8 @@ else:
     nn_ha_host_port_map[config['clusterHostInfo']['namenode_host'][0]] = namenode_metadata_port
   else:
     namenode_metadata_port = '8020'
+    
+os_family = System.get_instance().os_family
 
 ganglia_port = "8651"
 ganglia_collector_slaves_port = "8660"

+ 5 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2

@@ -61,7 +61,11 @@ ScriptAlias {{cgi_weblink}} "{{cgi_dir}}"
    Require valid-user
 </Directory>
 
-Alias /{{nagios_service_name}} "{{nagios_web_dir}}"
+Alias /nagios "{{nagios_web_dir}}"
+{# Ubuntu has different nagios url #}
+{% if os_family == "debian" %}
+Alias /nagios3 "{{nagios_web_dir}}"
+{% endif %}
 
 <Directory "{{nagios_web_dir}}">
 #  SSLRequireSSL