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

small updates to syncronize nomenclature

This commit is contained in:
Jordi Sanfeliu 2019-03-13 09:05:34 +01:00
parent f47bc5ccea
commit 9527c0233b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Monitorix.pm
View File

@ -157,7 +157,7 @@ sub httpd_setup {
}
} else {
if(!grep {$_ eq $config->{httpd_builtin}->{host}} ("localhost", "127.0.0.1")) {
logger("WARNING: the built-in HTTP server has authentication disabled.");
logger("WARNING: the HTTP built-in server has authentication disabled.");
}
}

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

@ -1,9 +1,9 @@
.\" Monitorix manpage.
.\" Copyright (C) 2005-2017 by Jordi Sanfeliu <jordi@fibranet.cat>
.\" Copyright (C) 2005-2019 by Jordi Sanfeliu <jordi@fibranet.cat>
.\"
.\" This is the man page for the monitorix.conf configuration file.
.\"
.TH monitorix.conf 5 "Sep 2017" 3.10.0 "Monitorix configuration file"
.TH monitorix.conf 5 "Mar 2019" 3.11.0 "Monitorix configuration file"
.SH NAME
monitorix.conf \- Configuration file for Monitorix.
.SH DESCRIPTION
@ -271,7 +271,7 @@ This is the URL prefix that Monitorix utilizes when refering to \fBmonitorix.cgi
.P
Default value: \fI/monitorix-cgi\fP
.RE
.SS Built-in HTTP server
.SS HTTP built-in server
.BI enabled
.RS
This enables or disables the HTTP server that Monitorix has built-in. This is specially useful for system administrators that don't want to install a web server (Apache, Lighttpd, Nginx, etc.) to see the Monitorix graphs.
@ -333,7 +333,7 @@ Default value:
.P
.BI https_url
.RS
This will force to use the prefix \fIhttps://\fP in all links. This is special useful if you plan to use a reverse-proxy HTTPS server in front of the Monitorix built-in HTTP.
This will force to use the prefix \fIhttps://\fP in all links. This is special useful if you plan to use a reverse-proxy HTTPS server in front of the Monitorix HTTP built-in server.
.P
Default value: \fIn\fP
.RE
@ -346,7 +346,7 @@ So in order to mitigate (hopefully) all this annoying hangups, this options acts
.P
Default value: \fIy\fP
.RE
.SS Built-in HTTP server with access authentication
.SS HTTP built-in server with access authentication
.BI enabled
.RS
This enables or disables the authentication mechanism to control access to pages and other resources. The only allowed mechanism is Basic and uses the 401 status code and the WWW-Authenticate response header.
@ -2913,7 +2913,7 @@ An example would be:
</remotehost_desc>
.RE
.P
As you can see all these three entries use URLs to designate the location of each remote server. This means that each server most also have been enabled the built-in HTTP server, or have been installed a CGI capable web server like Apache.
As you can see all these three entries use URLs to designate the location of each remote server. This means that each server most also have been enabled the HTTP built-in server, or have been installed a CGI capable web server like Apache.
.RE
.P
.BI groups
@ -3070,7 +3070,7 @@ This is where you can enter the upper-limit and lower-limit values (separated by
.SH AUTHOR
Monitorix is written by Jordi Sanfeliu <jordi@fibranet.cat>
.SH COPYRIGHT
Copyright \(co 2005-2017 Jordi Sanfeliu
Copyright \(co 2005-2019 Jordi Sanfeliu
.br
Licensed under the GNU General Public License version 2 (GPLv2).
.SH SEE ALSO

4
monitorix
View File

@ -89,7 +89,7 @@ sub HUP_handler {
kill(15, $config{httpd_pid});
kill(9, $config{httpd_pid});
httpd_setup(\%config, $options{d});
logger("Restarted built-in HTTP server (pid $config{httpd_pid}).") if (defined($config{httpd_pid}));
logger("Restarted HTTP built-in server (pid $config{httpd_pid}).") if (defined($config{httpd_pid}));
}
}
}
@ -729,7 +729,7 @@ if(lc($config{httpd_builtin}->{enabled}) eq "y") {
require HTTPServer;
httpd_setup(\%config, $options{d});
logger("Started built-in HTTP server (pid $config{httpd_pid}).") if (defined($config{httpd_pid}));
logger("Started HTTP built-in server (pid $config{httpd_pid}).") if (defined($config{httpd_pid}));
}
setpriority(0, 0, $config{priority} || 0);