ecf046c6f9
- replace more hardcoded php binary names with ${MODPHP_BIN}, unbreaks some
scripts as we include the PHP release branch in the string (php-5.6 etc).
- drop php-mysql dependency, no longer required.
82 lines
4.1 KiB
Plaintext
82 lines
4.1 KiB
Plaintext
$OpenBSD: patch-includes_defaults_inc_php,v 1.29 2017/12/13 15:30:43 sthen Exp $
|
|
|
|
N.B. snmpgetnext was not in upstream file at time of adding here
|
|
|
|
Index: includes/defaults.inc.php
|
|
--- includes/defaults.inc.php.orig
|
|
+++ includes/defaults.inc.php
|
|
@@ -42,25 +42,26 @@ $config['db_socket'] = null;
|
|
$config['own_hostname'] = 'localhost';
|
|
|
|
// Location of executables
|
|
-//$config['fping'] = '/usr/sbin/fping';
|
|
-//$config['fping6'] = '/usr/sbin/fping6';
|
|
+$config['fping'] = '/usr/local/sbin/fping';
|
|
+$config['fping6'] = '/usr/local/sbin/fping6';
|
|
$config['fping_options']['retries'] = 3;
|
|
$config['fping_options']['timeout'] = 500;
|
|
$config['fping_options']['count'] = 3;
|
|
$config['fping_options']['millisec'] = 200;
|
|
-$config['snmpwalk'] = '/usr/bin/snmpwalk';
|
|
-$config['snmpget'] = '/usr/bin/snmpget';
|
|
-$config['snmpbulkwalk'] = '/usr/bin/snmpbulkwalk';
|
|
-$config['snmptranslate'] = '/usr/bin/snmptranslate';
|
|
+$config['snmpwalk'] = '/usr/local/bin/snmpwalk';
|
|
+$config['snmpget'] = '/usr/local/bin/snmpget';
|
|
+$config['snmpgetnext'] = '/usr/local/bin/snmpgetnext';
|
|
+$config['snmpbulkwalk'] = '/usr/local/bin/snmpbulkwalk';
|
|
+$config['snmptranslate'] = '/usr/local/bin/snmptranslate';
|
|
$config['whois'] = '/usr/bin/whois';
|
|
-$config['ping'] = '/bin/ping';
|
|
-$config['mtr'] = '/usr/bin/mtr';
|
|
-$config['nmap'] = '/usr/bin/nmap';
|
|
-$config['nagios_plugins'] = '/usr/lib/nagios/plugins';
|
|
-$config['ipmitool'] = '/usr/bin/ipmitool';
|
|
-$config['virsh'] = '/usr/bin/virsh';
|
|
-$config['dot'] = '/usr/bin/dot';
|
|
-$config['sfdp'] = '/usr/bin/sfdp';
|
|
+$config['ping'] = '/sbin/ping';
|
|
+$config['mtr'] = '/usr/local/sbin/mtr';
|
|
+$config['nmap'] = '/usr/local/bin/nmap';
|
|
+$config['nagios_plugins'] = '/usr/local/libexec/nagios/plugins';
|
|
+$config['ipmitool'] = '/usr/local/bin/ipmitool';
|
|
+$config['virsh'] = '/usr/local/bin/virsh';
|
|
+$config['dot'] = '/usr/local/bin/dot';
|
|
+$config['sfdp'] = '/usr/local/bin/sfdp';
|
|
|
|
// Memcached - Keep immediate statistics
|
|
$config['memcached']['enable'] = false;
|
|
@@ -501,11 +502,11 @@ $config['billing']['bill_autoadd'] = 0;
|
|
$config['billing']['base'] = 1000;
|
|
// Set the base to divider bytes to kB, MB, GB ,... (1000|1024)
|
|
// External Integration
|
|
-// $config['rancid_configs'][] = '/var/lib/rancid/network/configs/';
|
|
+// $config['rancid_configs'][] = '/var/rancid/network/configs/';
|
|
$config['rancid_ignorecomments'] = 0;
|
|
// Ignore lines starting with #
|
|
-// $config['collectd_dir'] = '/var/lib/collectd/rrd';
|
|
-// $config['smokeping']['dir'] = "/var/lib/smokeping/";
|
|
+// $config['collectd_dir'] = '/var/collectd/rrd';
|
|
+// $config['smokeping']['dir'] = "/var/db/smokeping/";
|
|
$config['smokeping']['pings'] = 20;
|
|
// $config['oxidized']['enabled'] = FALSE;//Set to TRUE
|
|
// $config['oxidized']['url'] = 'http://127.0.0.1:8888';// Set the Oxidized rest URL
|
|
@@ -513,7 +514,7 @@ $config['smokeping']['pings'] = 20;
|
|
// NFSen RRD dir.
|
|
$config['nfsen_enable'] = 0;
|
|
// $config['nfsen_split_char'] = "_";
|
|
-// $config['nfsen_rrds'] = "/var/nfsen/profiles-stat/live/";
|
|
+// $config['nfsen_rrds'] = "/var/db/nfsen/profiles-stat/live/";
|
|
// $config['nfsen_suffix'] = "_yourdomain_com";
|
|
// Location Mapping
|
|
// Use this feature to map ugly locations to pretty locations
|
|
@@ -852,7 +853,7 @@ $config['api_demo'] = 0;
|
|
// Set this to 1 if you want to disable some untrusting features for the API
|
|
// Distributed Poller-Settings
|
|
$config['distributed_poller'] = false;
|
|
-$config['distributed_poller_name'] = trim(file_get_contents('/proc/sys/kernel/hostname'));
|
|
+$config['distributed_poller_name'] = trim(file_get_contents('/etc/myname'));
|
|
$config['distributed_poller_group'] = 0;
|
|
$config['distributed_poller_memcached_host'] = 'example.net';
|
|
$config['distributed_poller_memcached_port'] = '11211';
|