From 2b9d2188b3da0a5eed0bc187621fd4876e997b0a Mon Sep 17 00:00:00 2001 From: Jordi Sanfeliu Date: Thu, 31 Jan 2013 14:44:06 +0100 Subject: [PATCH] changed the path cgi-bin to cgi --- docs/monitorix-apache.conf | 4 ++-- docs/monitorix-lighttpd.conf | 2 +- docs/monitorix.spec | 6 +++--- lib/hptemp.pm | 2 +- man/man5/monitorix.conf.5 | 4 ++-- man/man8/monitorix.8 | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/monitorix-apache.conf b/docs/monitorix-apache.conf index 93247e5..772957f 100644 --- a/docs/monitorix-apache.conf +++ b/docs/monitorix-apache.conf @@ -3,9 +3,9 @@ # Alias /monitorix /usr/share/monitorix -ScriptAlias /monitorix-cgi /usr/share/monitorix/cgi-bin +ScriptAlias /monitorix-cgi /usr/share/monitorix/cgi - + DirectoryIndex monitorix.cgi Options ExecCGI Order Deny,Allow diff --git a/docs/monitorix-lighttpd.conf b/docs/monitorix-lighttpd.conf index b0f9b24..6de6d80 100644 --- a/docs/monitorix-lighttpd.conf +++ b/docs/monitorix-lighttpd.conf @@ -1,4 +1,4 @@ $HTTP["host"] =~ "your\.monitorix\.vhost$" { server.document-root = "/var/www/localhost/htdocs/monitorix" - alias.url = ( "/cgi-bin" => "/var/www/localhost/cgi-bin/" ) + alias.url = ( "/cgi" => "/var/www/localhost/cgi/" ) } diff --git a/docs/monitorix.spec b/docs/monitorix.spec index 0dbecf3..2a9f041 100644 --- a/docs/monitorix.spec +++ b/docs/monitorix.spec @@ -56,8 +56,8 @@ install -m 0644 logo_top.png %{buildroot}%{_datadir}/monitorix install -m 0644 logo_bot.png %{buildroot}%{_datadir}/monitorix install -m 0644 monitorixico.png %{buildroot}%{_datadir}/monitorix mkdir -p %{buildroot}%{_datadir}/monitorix/imgs -mkdir -p %{buildroot}%{_datadir}/monitorix/cgi-bin -install -m 0755 monitorix.cgi %{buildroot}%{_datadir}/monitorix/cgi-bin +mkdir -p %{buildroot}%{_datadir}/monitorix/cgi +install -m 0755 monitorix.cgi %{buildroot}%{_datadir}/monitorix/cgi mkdir -p %{buildroot}%{_localstatedir}/lib/monitorix/reports install -m 0644 reports/*.html %{buildroot}%{_localstatedir}/lib/monitorix/reports mkdir -p %{buildroot}%{_localstatedir}/lib/monitorix/usage @@ -84,7 +84,7 @@ rm -rf %{buildroot} %{_datadir}/monitorix/logo_top.png %{_datadir}/monitorix/logo_bot.png %{_datadir}/monitorix/monitorixico.png -%{_datadir}/monitorix/cgi-bin/monitorix.cgi +%{_datadir}/monitorix/cgi/monitorix.cgi %attr(777,apache,apache) %{_datadir}/monitorix/imgs %attr(755,root,root) %{_localstatedir}/lib/monitorix/usage %config(noreplace) %{_localstatedir}/lib/monitorix/reports/*.html diff --git a/lib/hptemp.pm b/lib/hptemp.pm index 46a1698..810c781 100644 --- a/lib/hptemp.pm +++ b/lib/hptemp.pm @@ -41,7 +41,7 @@ sub hptemp_init { # save the output of 'hplog -t' since only 'root' is able to run it my @data = ; close(IN); - open(OUT, "> $config->{base_dir}/cgi-bin/monitorix.hplog"); + open(OUT, "> $config->{base_dir}/cgi/monitorix.hplog"); print(OUT @data); close(OUT); diff --git a/man/man5/monitorix.conf.5 b/man/man5/monitorix.conf.5 index 5285459..4c7068e 100644 --- a/man/man5/monitorix.conf.5 +++ b/man/man5/monitorix.conf.5 @@ -13,7 +13,7 @@ It consists mainly of two programs: a collector, called \fBmonitorix\fP, which i .P Every time \fBmonitorix\fP is started it reads the configuration file from the path specified in the command line (using the \fB-c\fP option), and once checked, it creates the \fIindex.html\fP file that will act as the Monitorix main page. .P -It also creates a file called \fI/cgi-bin/monitorix.conf.path\fP that includes the absolute path of the configuration file. This file will be read by \fBmonitorix.cgi\fP to determine the exact location of the configuration file. If for any reason it is unable to locate this file, Monitorix will try two alternate locations: \fI/etc/monitorix.conf\fP and \fI/usr/local/etc/monitorix.conf\fP. +It also creates a file called \fI/cgi/monitorix.conf.path\fP that includes the absolute path of the configuration file. This file will be read by \fBmonitorix.cgi\fP to determine the exact location of the configuration file. If for any reason it is unable to locate this file, Monitorix will try two alternate locations: \fI/etc/monitorix.conf\fP and \fI/usr/local/etc/monitorix.conf\fP. .SH CONFIGURATION OPTIONS Blank lines are ignored, and whitespace before and after a token or value is ignored as well as tabulators, although a value can contain whitespace within. Lines which begin with a # are considered comments and ignored. .P @@ -89,7 +89,7 @@ Default value: \fIn\fP This is the absolute path to the directory where all the web elements are located: .P .RS -\fIcgi-bin/\fP \fBmonitorix.cgi\fP script directory +\fIcgi/\fP \fBmonitorix.cgi\fP script directory .br \fIimgs/\fP .png graph images directory .br diff --git a/man/man8/monitorix.8 b/man/man8/monitorix.8 index 22749bb..b0b86e3 100644 --- a/man/man8/monitorix.8 +++ b/man/man8/monitorix.8 @@ -39,10 +39,10 @@ Note that the configuration file is not re-read. .SH FILES The following is the set of the special files created on every startup: .TP 41 -\fB/cgi-bin/monitorix.conf.path\fP +\fB/cgi/monitorix.conf.path\fP stores the path of \fIconfigfile\fP. .TP 41 -\fB/cgi-bin/monitorix.hplog\fP +\fB/cgi/monitorix.hplog\fP stores the output of \fIhplog\fP. .TP 41 \fB/index.html\fP