Bläddra i källkod

AMBARI-6419. Nagios UI on Ubuntu is broken not showing any dynamic contents (aonishuk)

Andrew Onishuk 11 år sedan
förälder
incheckning
dc43984ca0

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

@@ -49,6 +49,8 @@ if System.get_instance().os_family == "debian":
     format("{conf_dir}/conf.d/generic-service_nagios2.cfg"),
     format("{conf_dir}/conf.d/timeperiods_nagios2.cfg"),
   ]
+  cgi_dir = "/usr/lib/cgi-bin/nagios3"
+  cgi_weblink = "/cgi-bin/nagios3"
 else:
   host_template = "linux-server"
   plugins_dir = "/usr/lib64/nagios/plugins"
@@ -61,6 +63,9 @@ else:
     format("{nagios_obj_dir}/templates.cfg"),
   ]
   
+  cgi_dir = "/usr/lib/nagios/cgi"
+  cgi_weblink = "/nagios/cgi-bin"
+  
 check_result_path = "/var/nagios/spool/checkresults"
 nagios_log_dir = "/var/log/nagios"
 nagios_log_archives_dir = format("{nagios_log_dir}/archives")

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

@@ -44,9 +44,9 @@
 # needed to fit your system.
 #
 
-ScriptAlias /nagios/cgi-bin "/usr/lib/nagios/cgi"
+ScriptAlias {{cgi_weblink}} "{{cgi_dir}}"
 
-<Directory "/usr/lib/nagios/cgi">
+<Directory "{{cgi_dir}}">
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
@@ -61,7 +61,7 @@ ScriptAlias /nagios/cgi-bin "/usr/lib/nagios/cgi"
    Require valid-user
 </Directory>
 
-Alias /nagios "{{nagios_web_dir}}"
+Alias /{{nagios_service_name}} "{{nagios_web_dir}}"
 
 <Directory "{{nagios_web_dir}}">
 #  SSLRequireSSL