mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed the path cgi-bin to cgi

This commit is contained in:
Jordi Sanfeliu 2013-01-31 14:44:06 +01:00
parent 00e64924ef
commit 2b9d2188b3
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/monitorix-apache.conf
View File

@ -3,9 +3,9 @@
# #
Alias /monitorix /usr/share/monitorix Alias /monitorix /usr/share/monitorix
ScriptAlias /monitorix-cgi /usr/share/monitorix/cgi-bin ScriptAlias /monitorix-cgi /usr/share/monitorix/cgi
<Directory /usr/share/monitorix/cgi-bin/> <Directory /usr/share/monitorix/cgi/>
DirectoryIndex monitorix.cgi DirectoryIndex monitorix.cgi
Options ExecCGI Options ExecCGI
Order Deny,Allow Order Deny,Allow

2
docs/monitorix-lighttpd.conf
View File

@ -1,4 +1,4 @@
$HTTP["host"] =~ "your\.monitorix\.vhost$" { $HTTP["host"] =~ "your\.monitorix\.vhost$" {
server.document-root = "/var/www/localhost/htdocs/monitorix" server.document-root = "/var/www/localhost/htdocs/monitorix"
alias.url = ( "/cgi-bin" => "/var/www/localhost/cgi-bin/" ) alias.url = ( "/cgi" => "/var/www/localhost/cgi/" )
} }

6
docs/monitorix.spec
View File

@ -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 logo_bot.png %{buildroot}%{_datadir}/monitorix
install -m 0644 monitorixico.png %{buildroot}%{_datadir}/monitorix install -m 0644 monitorixico.png %{buildroot}%{_datadir}/monitorix
mkdir -p %{buildroot}%{_datadir}/monitorix/imgs mkdir -p %{buildroot}%{_datadir}/monitorix/imgs
mkdir -p %{buildroot}%{_datadir}/monitorix/cgi-bin mkdir -p %{buildroot}%{_datadir}/monitorix/cgi
install -m 0755 monitorix.cgi %{buildroot}%{_datadir}/monitorix/cgi-bin install -m 0755 monitorix.cgi %{buildroot}%{_datadir}/monitorix/cgi
mkdir -p %{buildroot}%{_localstatedir}/lib/monitorix/reports mkdir -p %{buildroot}%{_localstatedir}/lib/monitorix/reports
install -m 0644 reports/*.html %{buildroot}%{_localstatedir}/lib/monitorix/reports install -m 0644 reports/*.html %{buildroot}%{_localstatedir}/lib/monitorix/reports
mkdir -p %{buildroot}%{_localstatedir}/lib/monitorix/usage mkdir -p %{buildroot}%{_localstatedir}/lib/monitorix/usage
@ -84,7 +84,7 @@ rm -rf %{buildroot}
%{_datadir}/monitorix/logo_top.png %{_datadir}/monitorix/logo_top.png
%{_datadir}/monitorix/logo_bot.png %{_datadir}/monitorix/logo_bot.png
%{_datadir}/monitorix/monitorixico.png %{_datadir}/monitorix/monitorixico.png
%{_datadir}/monitorix/cgi-bin/monitorix.cgi %{_datadir}/monitorix/cgi/monitorix.cgi
%attr(777,apache,apache) %{_datadir}/monitorix/imgs %attr(777,apache,apache) %{_datadir}/monitorix/imgs
%attr(755,root,root) %{_localstatedir}/lib/monitorix/usage %attr(755,root,root) %{_localstatedir}/lib/monitorix/usage
%config(noreplace) %{_localstatedir}/lib/monitorix/reports/*.html %config(noreplace) %{_localstatedir}/lib/monitorix/reports/*.html

2
lib/hptemp.pm
View File

@ -41,7 +41,7 @@ sub hptemp_init {
# save the output of 'hplog -t' since only 'root' is able to run it # save the output of 'hplog -t' since only 'root' is able to run it
my @data = <IN>; my @data = <IN>;
close(IN); close(IN);
open(OUT, "> $config->{base_dir}/cgi-bin/monitorix.hplog"); open(OUT, "> $config->{base_dir}/cgi/monitorix.hplog");
print(OUT @data); print(OUT @data);
close(OUT); close(OUT);

4
man/man5/monitorix.conf.5
View File

@ -13,7 +13,7 @@ It consists mainly of two programs: a collector, called \fBmonitorix\fP, which i
.P .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. 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 .P
It also creates a file called \fI<base_dir>/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<base_dir>/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 .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. 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 .P
@ -89,7 +89,7 @@ Default value: \fIn\fP
This is the absolute path to the directory where all the web elements are located: This is the absolute path to the directory where all the web elements are located:
.P .P
.RS .RS
\fIcgi-bin/\fP \fBmonitorix.cgi\fP script directory \fIcgi/\fP \fBmonitorix.cgi\fP script directory
.br .br
\fIimgs/\fP .png graph images directory \fIimgs/\fP .png graph images directory
.br .br

4
man/man8/monitorix.8
View File

@ -39,10 +39,10 @@ Note that the configuration file is not re-read.
.SH FILES .SH FILES
The following is the set of the special files created on every startup: The following is the set of the special files created on every startup:
.TP 41 .TP 41
\fB<base_dir>/cgi-bin/monitorix.conf.path\fP \fB<base_dir>/cgi/monitorix.conf.path\fP
stores the path of \fIconfigfile\fP. stores the path of \fIconfigfile\fP.
.TP 41 .TP 41
\fB<base_dir>/cgi-bin/monitorix.hplog\fP \fB<base_dir>/cgi/monitorix.hplog\fP
stores the output of \fIhplog\fP. stores the output of \fIhplog\fP.
.TP 41 .TP 41
\fB<base_dir>/index.html\fP \fB<base_dir>/index.html\fP