From 772d1762a7feff9849b9c1bf17f847f131be98f2 Mon Sep 17 00:00:00 2001 From: Nils Steinger Date: Tue, 22 Sep 2015 14:57:23 +0200 Subject: [PATCH] Use relative path for fping6 fping6 will be in /usr/bin on Debian-based systems, but /usr/sbin on CentOS. Have PHP figure out where fping6 is, to avoid breaking existing setups on CentOS. --- doc/Support/Configuration.md | 2 +- includes/defaults.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Support/Configuration.md b/doc/Support/Configuration.md index 1694a4fb91..865b00b9b5 100644 --- a/doc/Support/Configuration.md +++ b/doc/Support/Configuration.md @@ -46,7 +46,7 @@ $config['rrdtool'] = "/usr/bin/rrdtool"; ```php $config['fping'] = "/usr/bin/fping"; -$config['fping6'] = "/usr/bin/fping6"; +$config['fping6'] = "fping6"; $config['fping_options']['retries'] = 3; $config['fping_options']['timeout'] = 500; $config['fping_options']['count'] = 3; diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 9236ef3531..2b28dbba67 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -52,7 +52,7 @@ $config['own_hostname'] = 'localhost'; // Location of executables $config['rrdtool'] = '/usr/bin/rrdtool'; $config['fping'] = '/usr/bin/fping'; -$config['fping6'] = '/usr/bin/fping6'; +$config['fping6'] = 'fping6'; $config['fping_options']['retries'] = 3; $config['fping_options']['timeout'] = 500; $config['fping_options']['count'] = 3;