nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 16:08:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:/cschoonover91/librenms into issue-3394

Browse Source
This commit is contained in:
Casey Schoonover
2016-04-20 15:40:47 -05:00
parent 6bdb8fc096 55edec811b
commit 2131774fcf
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/Installation/Installation-(Debian-Ubuntu).md
+1 -1
View File
@@ -128,7 +128,7 @@ Next, add the following to `/etc/apache2/sites-available/librenms.conf`:
</VirtualHost>
```
If you are running Apache 2.2.18 or higher then change AllowEncodedSlashes to NoDecode
If you are running Apache 2.2.18 or higher then change `AllowEncodedSlashes On` to `AllowEncodedSlashes NoDecode`
If you have Apache 2.3 or newer then please add the following line before `AllowOverride All`:
doc/Installation/Installation-Nginx-(Debian-Ubuntu).md
+3 -3
View File
@@ -71,7 +71,7 @@ You need to configure snmpd appropriately if you have not already done so. An a
Adding the above line to `/etc/snmp/snmpd.conf` and running `service snmpd restart` will activate this config.
In `/etc/php5/apache2/php.ini` and `/etc/php5/cli/php.ini`, ensure date.timezone is set to your preferred time zone. See http://php.net/manual/en/timezones.php for a list of supported timezones. Valid
In `/etc/php5/fpm/php.ini` and `/etc/php5/cli/php.ini`, ensure date.timezone is set to your preferred time zone. See http://php.net/manual/en/timezones.php for a list of supported timezones. Valid
examples are: "America/New York", "Australia/Brisbane", "Etc/UTC".
Please also ensure that `allow_url_fopen` is enabled. Other functions needed for LibreNMS include `exec,passthru,shell_exec,escapeshellarg,escapeshellcmd,proc_close,proc_open,popen`.
@@ -101,7 +101,7 @@ Sometimes the initial clone can take quite a while (nearly 3 minutes on a 10 Mbp
### Web Interface ###
To prepare the web interface (and adding devices shortly), you'll need to create and chown a directory as well as create an Apache vhost.
To prepare the web interface (and adding devices shortly), you'll need to create and chown a directory as well as create a Nginx vhost.
First, create and chown the `rrd` directory and create the `logs` directory:
@@ -127,7 +127,7 @@ server {
}
location ~ \.php {
fastcgi_param PATH_INFO $fastcgi_path_info;
include fastcgi.conf;
include fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php5-fpm.sock;
}
includes/services/check_dhcp.inc.php
+2
View File
@@ -0,0 +1,2 @@
<?php
$check_cmd = $config['nagios_plugins'] . "/check_dhcp ".$service['service_param'];