From ed24d95f001f315d9a3094862f33596a687977c0 Mon Sep 17 00:00:00 2001 From: Aaron Daniels Date: Mon, 18 Apr 2016 08:57:33 +1000 Subject: [PATCH 1/3] - Added $check_cmd for check_dhcp as per: https://github.com/librenms/librenms/pull/3244#issuecomment-210145913 --- includes/services/check_dhcp.inc.php | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 includes/services/check_dhcp.inc.php diff --git a/includes/services/check_dhcp.inc.php b/includes/services/check_dhcp.inc.php new file mode 100644 index 000000000..c56ca5751 --- /dev/null +++ b/includes/services/check_dhcp.inc.php @@ -0,0 +1,2 @@ + Date: Tue, 19 Apr 2016 18:08:30 -0400 Subject: [PATCH 2/3] Update Nginx Install Doc --- doc/Installation/Installation-Nginx-(Debian-Ubuntu).md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Installation/Installation-Nginx-(Debian-Ubuntu).md b/doc/Installation/Installation-Nginx-(Debian-Ubuntu).md index 581aada57..957d0a970 100644 --- a/doc/Installation/Installation-Nginx-(Debian-Ubuntu).md +++ b/doc/Installation/Installation-Nginx-(Debian-Ubuntu).md @@ -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; } From 98c491a70a5205b4724ea51e8c2da5b42b6f1084 Mon Sep 17 00:00:00 2001 From: vectr0n Date: Tue, 19 Apr 2016 19:00:17 -0400 Subject: [PATCH 3/3] Change Wording for AllowEncodedSlashes to make it more clear to users --- doc/Installation/Installation-(Debian-Ubuntu).md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Installation/Installation-(Debian-Ubuntu).md b/doc/Installation/Installation-(Debian-Ubuntu).md index 50d216d76..9431fd124 100644 --- a/doc/Installation/Installation-(Debian-Ubuntu).md +++ b/doc/Installation/Installation-(Debian-Ubuntu).md @@ -128,7 +128,7 @@ Next, add the following to `/etc/apache2/sites-available/librenms.conf`: ``` -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`: