Package: nagios3-cgi
Version: 3.2.0-5
Tags: patch
Severity: wishlist
Please move the SSI directory to /etc or make user configurable.
Patch attached.
--
Omni Flux
diff -uNr nagios-3.2.0.orig/cgi/cgiutils.c nagios-3.2.0/cgi/cgiutils.c
--- nagios-3.2.0.orig/cgi/cgiutils.c 2009-07-31 10:54:20.000000000 -0600
+++ nagios-3.2.0/cgi/cgiutils.c 2010-04-17 22:27:23.000000000 -0600
@@ -329,11 +329,15 @@
snprintf(physical_images_path,sizeof(physical_images_path),"%simages/",physical_html_path);
physical_images_path[sizeof(physical_images_path)-1]='\x0';
+ }
-
snprintf(physical_ssi_path,sizeof(physical_images_path),"%sssi/",physical_html_path);
+ else if(!strcmp(var,"physical_ssi_path")){
+
strncpy(physical_ssi_path,val,sizeof(physical_ssi_path));
physical_ssi_path[sizeof(physical_ssi_path)-1]='\x0';
+ strip(physical_ssi_path);
+ if(physical_ssi_path[strlen(physical_ssi_path)-1]!='/'
&& (strlen(physical_ssi_path) < sizeof(physical_ssi_path)-1))
+ strcat(physical_ssi_path,"/");
}
-
else if(!strcmp(var,"url_html_path")){
strncpy(url_html_path,val,sizeof(url_html_path));
diff -uNr nagios-3.2.0.orig/debian/nagios3-cgi.dirs
nagios-3.2.0/debian/nagios3-cgi.dirs
--- nagios-3.2.0.orig/debian/nagios3-cgi.dirs 2010-04-17 18:31:27.000000000
-0600
+++ nagios-3.2.0/debian/nagios3-cgi.dirs 2010-04-17 22:31:32.000000000
-0600
@@ -1,3 +1,3 @@
etc/nagios3/stylesheets
-usr/share/nagios3/htdocs/ssi
+etc/nagios3/ssi
usr/lib/cgi-bin
diff -uNr nagios-3.2.0.orig/html/docs/configcgi.html
nagios-3.2.0/html/docs/configcgi.html
--- nagios-3.2.0.orig/html/docs/configcgi.html 2009-06-17 09:13:52.000000000
-0600
+++ nagios-3.2.0/html/docs/configcgi.html 2010-04-17 22:29:04.000000000
-0600
@@ -222,6 +222,54 @@
+<a name="physical_ssi_path"></a>
+
+<table border="0" width="100%" class="Default">
+
+<tr>
+
+<td bgcolor="#cbcbcb"><strong>Physical SSI Path</strong></td>
+
+</tr>
+
+</table>
+
+<br>
+
+
+
+<table border="0" class="Default">
+
+<tr>
+
+<td valign=top>Format:</td>
+
+<td><strong>physical_ssi_path=<path></strong></td>
+
+</tr>
+
+<tr>
+
+<td valign=top>Example:</td>
+
+<td><font
color="red"><strong>physical_html_path=/usr/local/nagios/etc/ssi</strong></font></td>
+
+</tr>
+
+</table>
+
+
+
+<p>
+
+This is the <i>physical</i> path where the SSI files for Nagios are kept on
your workstation or server.
+
+</p>
+
+
+
+
+
<a name="url_html_path"></a>
<table border="0" width="100%" class="Default">
diff -uNr nagios-3.2.0.orig/sample-config/cgi.cfg.in
nagios-3.2.0/sample-config/cgi.cfg.in
--- nagios-3.2.0.orig/sample-config/cgi.cfg.in 2009-06-17 09:13:52.000000000
-0600
+++ nagios-3.2.0/sample-config/cgi.cfg.in 2010-04-17 22:23:35.000000000
-0600
@@ -25,6 +25,15 @@
+# PHYSICAL SSI PATH
+# This is the path where the SSI files for Nagios reside. This
+# value is used by the CGIs to locate the custom headers and
+# footers to include in generated pages.
+
+physical_ssi_pa...@sysconfdir@/ssi
+
+
+
# URL HTML PATH
# This is the path portion of the URL that corresponds to the
# physical location of the Nagios HTML files (as defined above).
