update to a LibreNMS snapshot from today, and start using a separate uid
This commit is contained in:
sthen
parent
724a731ad7
commit
a4fd0a0fa5
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2015/07/06 11:25:36 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2015/07/16 02:50:33 sthen Exp $
|
||||
|
||||
COMMENT = auto-discovering network management/monitoring system
|
||||
|
||||
DISTNAME = librenms-0.20150701
|
||||
DISTNAME = librenms-0.20150716
|
||||
GH_ACCOUNT = librenms
|
||||
GH_PROJECT = librenms
|
||||
GH_COMMIT = 7d6dbe4d9b2ffa6c5fd21bd4172e3c0b177e2b06
|
||||
REVISION = 0
|
||||
GH_COMMIT = f51be32ca9390f15f9d4975a755fbeb29c4be502
|
||||
|
||||
CATEGORIES = net www
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (librenms-0.20150701.tar.gz) = +t5LL7NiRQUX0EISLcc1GX20pyZyIMo6yiBX0Sf29vc=
|
||||
SIZE (librenms-0.20150701.tar.gz) = 24270405
|
||||
SHA256 (librenms-0.20150716.tar.gz) = 4oQDouOjLqTOtJAGJOZz+rerN3qJ6g+K3byGec47KVg=
|
||||
SIZE (librenms-0.20150716.tar.gz) = 24429282
|
||||
|
||||
@ -1,20 +1,19 @@
|
||||
$OpenBSD: patch-alerts_php,v 1.1.1.1 2015/04/23 16:44:34 sthen Exp $
|
||||
--- alerts.php.orig Tue Apr 21 15:00:22 2015
|
||||
+++ alerts.php Tue Apr 21 15:04:04 2015
|
||||
@@ -25,6 +25,7 @@
|
||||
$OpenBSD: patch-alerts_php,v 1.2 2015/07/16 02:50:33 sthen Exp $
|
||||
--- alerts.php.orig Thu Jul 16 01:06:20 2015
|
||||
+++ alerts.php Thu Jul 16 01:12:01 2015
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
include_once("includes/defaults.inc.php");
|
||||
include_once("config.php");
|
||||
+include_once("includes/definitions.inc.php");
|
||||
require_once 'includes/defaults.inc.php';
|
||||
require_once 'config.php';
|
||||
+require_once '/includes/definitions.inc.php';
|
||||
|
||||
$lock = false;
|
||||
if( file_exists($config['install_dir']."/.alerts.lock") ) {
|
||||
@@ -40,8 +41,6 @@ if( $lock === true ) {
|
||||
} else {
|
||||
file_put_contents($config['install_dir']."/.alerts.lock", getmypid());
|
||||
if (file_exists($config['install_dir'].'/.alerts.lock')) {
|
||||
@@ -44,7 +45,6 @@ else {
|
||||
file_put_contents($config['install_dir'].'/.alerts.lock', getmypid());
|
||||
}
|
||||
-
|
||||
-include_once($config['install_dir']."/includes/definitions.inc.php");
|
||||
include_once($config['install_dir']."/includes/functions.php");
|
||||
include_once($config['install_dir']."/includes/alerts.inc.php");
|
||||
|
||||
-require_once $config['install_dir'].'/includes/definitions.inc.php';
|
||||
require_once $config['install_dir'].'/includes/functions.php';
|
||||
require_once $config['install_dir'].'/includes/alerts.inc.php';
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-html_index_php,v 1.1.1.1 2015/04/23 16:44:34 sthen Exp $
|
||||
--- html/index.php.orig Tue Apr 21 17:53:59 2015
|
||||
+++ html/index.php Tue Apr 21 17:54:05 2015
|
||||
$OpenBSD: patch-html_index_php,v 1.2 2015/07/16 02:50:33 sthen Exp $
|
||||
--- html/index.php.orig Thu Jul 16 01:06:21 2015
|
||||
+++ html/index.php Thu Jul 16 01:06:30 2015
|
||||
@@ -12,7 +12,7 @@
|
||||
*
|
||||
*/
|
||||
@ -8,5 +8,5 @@ $OpenBSD: patch-html_index_php,v 1.1.1.1 2015/04/23 16:44:34 sthen Exp $
|
||||
-if( strstr($_SERVER['SERVER_SOFTWARE'],"nginx") ) {
|
||||
+if( strstr($_SERVER['SERVER_SOFTWARE'],"nginx") && !empty($_SERVER['PATH_TRANSLATED'])) {
|
||||
$_SERVER['PATH_INFO'] = str_replace($_SERVER['PATH_TRANSLATED'].$_SERVER['PHP_SELF'],"",$_SERVER['ORIG_SCRIPT_FILENAME']);
|
||||
} else {
|
||||
$_SERVER['PATH_INFO'] = !empty($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : (!empty($_SERVER['ORIG_PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : '');
|
||||
}
|
||||
else {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-html_install_php,v 1.4 2015/06/25 20:47:27 sthen Exp $
|
||||
--- html/install.php.orig Mon Jun 22 09:01:46 2015
|
||||
+++ html/install.php Mon Jun 22 09:01:49 2015
|
||||
@@ -388,7 +388,8 @@ $config_file = <<<"EOD"
|
||||
$OpenBSD: patch-html_install_php,v 1.5 2015/07/16 02:50:33 sthen Exp $
|
||||
--- html/install.php.orig Thu Jul 16 01:06:21 2015
|
||||
+++ html/install.php Thu Jul 16 01:06:30 2015
|
||||
@@ -366,7 +366,8 @@ $config_file = <<<"EOD"
|
||||
#\$config\['base_url'\] = "http://librenms.company.com";
|
||||
|
||||
### Enable this to use rrdcached. Be sure rrd_dir is within the rrdcached dir
|
||||
|
||||
@ -1,89 +1,88 @@
|
||||
$OpenBSD: patch-includes_defaults_inc_php,v 1.4 2015/06/25 20:47:27 sthen Exp $
|
||||
--- includes/defaults.inc.php.orig Thu Jun 25 20:56:52 2015
|
||||
+++ includes/defaults.inc.php Thu Jun 25 20:59:02 2015
|
||||
@@ -31,7 +31,7 @@ $config['project_name'] = "LibreNMS";
|
||||
$config['project_id'] = strtolower($config['project_name']);
|
||||
$OpenBSD: patch-includes_defaults_inc_php,v 1.5 2015/07/16 02:50:33 sthen Exp $
|
||||
--- includes/defaults.inc.php.orig Thu Jul 16 01:06:21 2015
|
||||
+++ includes/defaults.inc.php Thu Jul 16 01:09:41 2015
|
||||
@@ -28,35 +28,35 @@ $config['project_name'] = 'LibreNMS';
|
||||
$config['project_id'] = strtolower($config['project_name']);
|
||||
|
||||
$config['temp_dir'] = "/tmp";
|
||||
-$config['install_dir'] = "/opt/" . $config['project_id'];
|
||||
+$config['install_dir'] = "/var/www/librenms";
|
||||
$config['log_dir'] = $config['install_dir'] . "/logs";
|
||||
$config['temp_dir'] = '/tmp';
|
||||
-$config['install_dir'] = '/opt/'.$config['project_id'];
|
||||
+$config['install_dir'] = '/var/www/librenms';
|
||||
$config['log_dir'] = $config['install_dir'].'/logs';
|
||||
|
||||
// What is my own hostname (used to identify this host in its own database)
|
||||
@@ -39,28 +39,28 @@ $config['own_hostname'] = "localhost";
|
||||
$config['own_hostname'] = 'localhost';
|
||||
|
||||
// Location of executables
|
||||
|
||||
-$config['rrdtool'] = "/usr/bin/rrdtool";
|
||||
-$config['fping'] = "/usr/bin/fping";
|
||||
+$config['rrdtool'] = "/usr/local/bin/rrdtool";
|
||||
+$config['fping'] = "/usr/local/sbin/fping";
|
||||
-$config['rrdtool'] = '/usr/bin/rrdtool';
|
||||
-$config['fping'] = '/usr/bin/fping';
|
||||
+$config['rrdtool'] = '/usr/local/bin/rrdtool';
|
||||
+$config['fping'] = '/usr/local/sbin/fping';
|
||||
$config['fping_options']['retries'] = 3;
|
||||
$config['fping_options']['timeout'] = 500;
|
||||
$config['fping_options']['count'] = 3;
|
||||
$config['fping_options']['count'] = 3;
|
||||
$config['fping_options']['millisec'] = 20;
|
||||
-$config['fping6'] = "/usr/bin/fping6";
|
||||
-$config['snmpwalk'] = "/usr/bin/snmpwalk";
|
||||
-$config['snmpget'] = "/usr/bin/snmpget";
|
||||
-$config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk";
|
||||
+$config['fping6'] = "/usr/local/sbin/fping6";
|
||||
+$config['snmpwalk'] = "/usr/local/bin/snmpwalk";
|
||||
+$config['snmpget'] = "/usr/local/bin/snmpget";
|
||||
+$config['snmpbulkwalk'] = "/usr/local/bin/snmpbulkwalk";
|
||||
$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['unflatten'] = "/usr/bin/unflatten";
|
||||
-$config['neato'] = "/usr/bin/neato";
|
||||
-$config['sfdp'] = "/usr/bin/sfdp";
|
||||
-$config['svn'] = "/usr/bin/svn";
|
||||
+$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['unflatten'] = "/usr/local/bin/unflatten";
|
||||
+$config['neato'] = "/usr/local/bin/neato";
|
||||
+$config['sfdp'] = "/usr/local/bin/sfdp";
|
||||
+$config['svn'] = "/usr/local/bin/svn";
|
||||
-$config['fping6'] = '/usr/bin/fping6';
|
||||
-$config['snmpwalk'] = '/usr/bin/snmpwalk';
|
||||
-$config['snmpget'] = '/usr/bin/snmpget';
|
||||
-$config['snmpbulkwalk'] = '/usr/bin/snmpbulkwalk';
|
||||
+$config['fping6'] = '/usr/local/sbin/fping6';
|
||||
+$config['snmpwalk'] = '/usr/local/bin/snmpwalk';
|
||||
+$config['snmpget'] = '/usr/local/bin/snmpget';
|
||||
+$config['snmpbulkwalk'] = '/usr/local/bin/snmpbulkwalk';
|
||||
$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['unflatten'] = '/usr/bin/unflatten';
|
||||
-$config['neato'] = '/usr/bin/neato';
|
||||
-$config['sfdp'] = '/usr/bin/sfdp';
|
||||
-$config['svn'] = '/usr/bin/svn';
|
||||
+$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['unflatten'] = '/usr/local/bin/unflatten';
|
||||
+$config['neato'] = '/usr/local/bin/neato';
|
||||
+$config['sfdp'] = '/usr/local/bin/sfdp';
|
||||
+$config['svn'] = '/usr/local/bin/svn';
|
||||
|
||||
// Memcached - Keep immediate statistics
|
||||
|
||||
@@ -290,17 +290,17 @@ $config['billing']['base'] = 1000; # Set
|
||||
|
||||
$config['memcached']['enable'] = false;
|
||||
@@ -377,17 +377,17 @@ $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['oxidized']['enabled'] = FALSE;//Set to TRUE
|
||||
//$config['oxidized']['url'] = 'http://127.0.0.1:8888';// Set the Oxidized rest URL
|
||||
|
||||
# NFSen RRD dir.
|
||||
-// $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['oxidized']['enabled'] = FALSE;//Set to TRUE
|
||||
// $config['oxidized']['url'] = 'http://127.0.0.1:8888';// Set the Oxidized rest URL
|
||||
// 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";
|
||||
|
||||
// $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
|
||||
@@ -605,7 +605,7 @@ $config['api_demo']
|
||||
|
||||
// Use this feature to map ugly locations to pretty locations
|
||||
@@ -696,7 +696,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'] = file_get_contents('/proc/sys/kernel/hostname');
|
||||
+$config['distributed_poller_name'] = file_get_contents('/etc/myname');
|
||||
$config['distributed_poller_group'] = 0;
|
||||
$config['distributed_poller_memcached_host'] = 'example.net';
|
||||
$config['distributed_poller_memcached_port'] = '11211';
|
||||
$config['distributed_poller'] = false;
|
||||
-$config['distributed_poller_name'] = file_get_contents('/proc/sys/kernel/hostname');
|
||||
+$config['distributed_poller_name'] = file_get_contents('/etc/myname');
|
||||
$config['distributed_poller_group'] = 0;
|
||||
$config['distributed_poller_memcached_host'] = 'example.net';
|
||||
$config['distributed_poller_memcached_port'] = '11211';
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-includes_definitions_inc_php,v 1.5 2015/06/25 20:47:27 sthen Exp $
|
||||
$OpenBSD: patch-includes_definitions_inc_php,v 1.6 2015/07/16 02:50:33 sthen Exp $
|
||||
|
||||
Minimal handling for running inside chroot. Not really recommended and some
|
||||
functionality will be lost, but it might be enough for some users.
|
||||
|
||||
--- includes/definitions.inc.php.orig Thu Jun 25 20:56:52 2015
|
||||
+++ includes/definitions.inc.php Thu Jun 25 20:56:55 2015
|
||||
@@ -1753,6 +1753,8 @@ if (isset($config['enable_printers']) && $config['enab
|
||||
$config['device_types'][$i]['icon'] = 'printer.png';
|
||||
--- includes/definitions.inc.php.orig Thu Jul 16 01:06:21 2015
|
||||
+++ includes/definitions.inc.php Thu Jul 16 01:10:11 2015
|
||||
@@ -1942,6 +1942,8 @@ if (isset($config['enable_printers']) && $config['enab
|
||||
$config['device_types'][$i]['icon'] = 'printer.png';
|
||||
}
|
||||
|
||||
+if (!is_dir($config['install_dir']) && is_dir('/var/www' . $config['install_dir'])) { $config['install_dir'] = '/var/www' . $config['install_dir']; }
|
||||
+
|
||||
//////////////////////////////
|
||||
# No changes below this line #
|
||||
//////////////////////////////
|
||||
//
|
||||
// No changes below this line #
|
||||
//
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-librenms_cron,v 1.3 2015/06/10 21:15:33 sthen Exp $
|
||||
--- librenms.cron.orig Wed Jun 10 18:12:49 2015
|
||||
+++ librenms.cron Wed Jun 10 18:12:51 2015
|
||||
@@ -1,7 +1,7 @@
|
||||
# It's recommended not to run this cron anymore - please see librenms.nonroot.cron
|
||||
|
||||
-33 */6 * * * root /var/www/librenms/discovery.php -h all >> /dev/null 2>&1
|
||||
-*/5 * * * * root /var/www/librenms/discovery.php -h new >> /dev/null 2>&1
|
||||
-*/5 * * * * root /var/www/librenms/poller-wrapper.py 16 >> /dev/null 2>&1
|
||||
-15 0 * * * root sh /var/www/librenms/daily.sh >> /dev/null 2>&1
|
||||
-* * * * * root /var/www/librenms/alerts.php >> /dev/null 2>&1
|
||||
+33 */6 * * * www /var/www/librenms/discovery.php -h all >> /dev/null 2>&1
|
||||
+*/5 * * * * www /var/www/librenms/discovery.php -h new >> /dev/null 2>&1
|
||||
+*/5 * * * * www /var/www/librenms/poller-wrapper.py 8 >> /dev/null 2>&1
|
||||
+15 0 * * * www sh /var/www/librenms/daily.sh >> /dev/null 2>&1
|
||||
+* * * * * www /var/www/librenms/alerts.php >> /dev/null 2>&1
|
||||
16
net/librenms/patches/patch-librenms_nonroot_cron
Normal file
16
net/librenms/patches/patch-librenms_nonroot_cron
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-librenms_nonroot_cron,v 1.1 2015/07/16 02:50:33 sthen Exp $
|
||||
--- librenms.nonroot.cron.orig Thu Jul 16 01:22:26 2015
|
||||
+++ librenms.nonroot.cron Thu Jul 16 01:22:54 2015
|
||||
@@ -1,7 +1,7 @@
|
||||
# Using this cron file requires an additional user on your system, please see install docs.
|
||||
|
||||
-33 */6 * * * librenms /var/www/librenms/discovery.php -h all >> /dev/null 2>&1
|
||||
-*/5 * * * * librenms /var/www/librenms/discovery.php -h new >> /dev/null 2>&1
|
||||
-*/5 * * * * librenms /var/www/librenms/cronic /var/www/librenms/poller-wrapper.py 16
|
||||
-15 0 * * * librenms sh /var/www/librenms/daily.sh >> /dev/null 2>&1
|
||||
-* * * * * librenms /var/www/librenms/alerts.php >> /dev/null 2>&1
|
||||
+33 */6 * * * _librenms /var/www/librenms/discovery.php -h all >> /dev/null 2>&1
|
||||
+*/5 * * * * _librenms /var/www/librenms/discovery.php -h new >> /dev/null 2>&1
|
||||
+*/5 * * * * _librenms /var/www/librenms/poller-wrapper.py 16
|
||||
+15 0 * * * _librenms sh /var/www/librenms/daily.sh >> /dev/null 2>&1
|
||||
+* * * * * _librenms /var/www/librenms/alerts.php >> /dev/null 2>&1
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-poller-wrapper_py,v 1.3 2015/06/25 20:47:27 sthen Exp $
|
||||
--- poller-wrapper.py.orig Mon Jun 22 09:01:49 2015
|
||||
+++ poller-wrapper.py Mon Jun 22 09:01:49 2015
|
||||
$OpenBSD: patch-poller-wrapper_py,v 1.4 2015/07/16 02:50:33 sthen Exp $
|
||||
--- poller-wrapper.py.orig Thu Jul 16 01:06:30 2015
|
||||
+++ poller-wrapper.py Thu Jul 16 01:06:30 2015
|
||||
@@ -57,7 +57,7 @@ config_file = ob_install_dir + '/config.php'
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-poller-wrapper_py,v 1.3 2015/06/25 20:47:27 sthen Exp $
|
||||
db_username = config['db_user']
|
||||
db_password = config['db_pass']
|
||||
|
||||
@@ -289,7 +289,7 @@ def poll_worker():
|
||||
@@ -292,7 +292,7 @@ def poll_worker():
|
||||
# EOC5
|
||||
try:
|
||||
start_time = time.time()
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-scripts_ntp-client_php,v 1.1.1.1 2015/04/23 16:44:34 sthen Exp $
|
||||
--- scripts/ntp-client.php.orig Fri Mar 20 15:18:34 2015
|
||||
+++ scripts/ntp-client.php Fri Mar 20 15:19:54 2015
|
||||
@@ -18,7 +18,7 @@
|
||||
$OpenBSD: patch-scripts_ntp-client_php,v 1.2 2015/07/16 02:50:33 sthen Exp $
|
||||
--- scripts/ntp-client.php.orig Thu Jul 16 01:06:30 2015
|
||||
+++ scripts/ntp-client.php Thu Jul 16 01:10:46 2015
|
||||
@@ -13,7 +13,7 @@
|
||||
//
|
||||
|
||||
// START SETTINGS ///
|
||||
|
||||
- $ntpq = "/usr/sbin/ntpq";
|
||||
+ $ntpq = "/usr/local/sbin/ntpq";
|
||||
|
||||
# Change this to true if you have clk_jitter, sys_jitter in the ntpq -c rv output
|
||||
$newstats_style = false;
|
||||
// START SETTINGS ///
|
||||
-$ntpq = '/usr/sbin/ntpq';
|
||||
+$ntpq = '/usr/local/sbin/ntpq';
|
||||
// Change this to true if you have clk_jitter, sys_jitter in the ntpq -c rv output
|
||||
$newstats_style = false;
|
||||
// END SETTINGS ///
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-scripts_ntpd-server_php,v 1.1.1.1 2015/04/23 16:44:34 sthen Exp $
|
||||
--- scripts/ntpd-server.php.orig Fri Mar 20 15:18:34 2015
|
||||
+++ scripts/ntpd-server.php Fri Mar 20 15:20:05 2015
|
||||
@@ -18,8 +18,8 @@
|
||||
$OpenBSD: patch-scripts_ntpd-server_php,v 1.2 2015/07/16 02:50:33 sthen Exp $
|
||||
--- scripts/ntpd-server.php.orig Thu Jul 16 01:06:30 2015
|
||||
+++ scripts/ntpd-server.php Thu Jul 16 01:10:57 2015
|
||||
@@ -12,8 +12,8 @@
|
||||
// All In One - Dennis de Houx <info@all-in-one.be>
|
||||
|
||||
// START SETTINGS ///
|
||||
|
||||
- $ntpq = "/usr/sbin/ntpq";
|
||||
- $ntpdc = "/usr/sbin/ntpdc";
|
||||
+ $ntpq = "/usr/local/sbin/ntpq";
|
||||
+ $ntpdc = "/usr/local/sbin/ntpdc";
|
||||
|
||||
# Change this to true if you have clk_jitter, sys_jitter in the ntpq -c rv output
|
||||
$newstats_style = false;
|
||||
// START SETTINGS ///
|
||||
-$ntpq = '/usr/sbin/ntpq';
|
||||
-$ntpdc = '/usr/sbin/ntpdc';
|
||||
+$ntpq = '/usr/local/sbin/ntpq';
|
||||
+$ntpdc = '/usr/local/sbin/ntpdc';
|
||||
// Change this to true if you have clk_jitter, sys_jitter in the ntpq -c rv output
|
||||
$newstats_style = false;
|
||||
// END SETTINGS ///
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-scripts_powerdns_php,v 1.1.1.1 2015/04/23 16:44:34 sthen Exp $
|
||||
--- scripts/powerdns.php.orig Fri Mar 20 15:19:22 2015
|
||||
+++ scripts/powerdns.php Fri Mar 20 15:19:46 2015
|
||||
@@ -18,7 +18,7 @@
|
||||
$OpenBSD: patch-scripts_powerdns_php,v 1.2 2015/07/16 02:50:33 sthen Exp $
|
||||
--- scripts/powerdns.php.orig Thu Jul 16 01:06:30 2015
|
||||
+++ scripts/powerdns.php Thu Jul 16 01:11:14 2015
|
||||
@@ -12,7 +12,7 @@
|
||||
// All In One - Dennis de Houx <info@all-in-one.be>
|
||||
|
||||
// START SETTINGS ///
|
||||
|
||||
- $pdnscontrol = "/usr/bin/pdns_control";
|
||||
+ $pdnscontrol = "/usr/local/bin/pdns_control";
|
||||
|
||||
-$pdnscontrol = '/usr/bin/pdns_control';
|
||||
+$pdnscontrol = '/usr/local/bin/pdns_control';
|
||||
// END SETTINGS ///
|
||||
|
||||
// DO NOT EDIT UNDER THIS LINE
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-validate_php,v 1.1 2015/06/10 21:15:33 sthen Exp $
|
||||
--- validate.php.orig Wed Jun 10 21:42:46 2015
|
||||
+++ validate.php Wed Jun 10 21:44:07 2015
|
||||
@@ -34,7 +34,7 @@ exit;
|
||||
|
||||
$OpenBSD: patch-validate_php,v 1.2 2015/07/16 02:50:33 sthen Exp $
|
||||
--- validate.php.orig Thu Jul 16 01:06:30 2015
|
||||
+++ validate.php Thu Jul 16 01:15:52 2015
|
||||
@@ -34,7 +34,7 @@ if (isset($options['h'])) {
|
||||
exit;
|
||||
}
|
||||
|
||||
-if (strstr(`php -ln config.php`,"No syntax errors detected")) {
|
||||
+if (strstr(`%PHP% -ln config.php`,"No syntax errors detected")) {
|
||||
-if (strstr(`php -ln config.php`, 'No syntax errors detected')) {
|
||||
+if (strstr(`%PHP% -ln config.php`, 'No syntax errors detected')) {
|
||||
$first_line = `head -n1 config.php`;
|
||||
$last_lines = explode(PHP_EOL,`tail -n2 config.php`);
|
||||
if (strstr($first_line,'\<\?php')) {
|
||||
$last_lines = explode(PHP_EOL, `tail -n2 config.php`);
|
||||
if (strstr($first_line, '\<\?php')) {
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2015/07/03 19:17:26 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2015/07/16 02:50:33 sthen Exp $
|
||||
@newgroup _librenms:755
|
||||
@newuser _librenms:755:_librenms:daemon:librenms user:/var/www/librenms:/sbin/nologin
|
||||
librenms/
|
||||
librenms/.gitignore
|
||||
librenms/.scrutinizer.yml
|
||||
@ -24,6 +26,7 @@ librenms/contrib/
|
||||
librenms/contrib/dev_init
|
||||
librenms/contrib/findit
|
||||
librenms/contrib/generate-iplist.php
|
||||
librenms/cronic
|
||||
librenms/daily.php
|
||||
librenms/daily.sh
|
||||
librenms/delhost.php
|
||||
@ -1524,6 +1527,7 @@ librenms/html/images/icons/inventory.png
|
||||
librenms/html/images/icons/ipmi.png
|
||||
librenms/html/images/icons/ipv4.png
|
||||
librenms/html/images/icons/ipv6.png
|
||||
librenms/html/images/icons/load.png
|
||||
librenms/html/images/icons/loadbalancer.png
|
||||
librenms/html/images/icons/memory.png
|
||||
librenms/html/images/icons/mempools.png
|
||||
@ -1547,6 +1551,7 @@ librenms/html/images/icons/sensors.png
|
||||
librenms/html/images/icons/server.png
|
||||
librenms/html/images/icons/services.png
|
||||
librenms/html/images/icons/snmp.png
|
||||
librenms/html/images/icons/state.png
|
||||
librenms/html/images/icons/storage.png
|
||||
librenms/html/images/icons/syslog.png
|
||||
librenms/html/images/icons/system.png
|
||||
@ -1623,6 +1628,8 @@ librenms/html/images/os/kyocera.png
|
||||
librenms/html/images/os/linksys.png
|
||||
librenms/html/images/os/linux.png
|
||||
librenms/html/images/os/mandrake.png
|
||||
librenms/html/images/os/mellanox.png
|
||||
librenms/html/images/os/meraki.png
|
||||
librenms/html/images/os/mge.png
|
||||
librenms/html/images/os/minkelsrms.png
|
||||
librenms/html/images/os/monowall.png
|
||||
@ -2574,7 +2581,6 @@ librenms/html/pages/bills/
|
||||
librenms/html/pages/bills.inc.php
|
||||
librenms/html/pages/bills/pmonth.inc.php
|
||||
librenms/html/pages/bills/search.inc.php
|
||||
librenms/html/pages/configuration.inc.php
|
||||
librenms/html/pages/customers.inc.php
|
||||
librenms/html/pages/deleted-ports.inc.php
|
||||
librenms/html/pages/delhost.inc.php
|
||||
@ -2623,7 +2629,6 @@ librenms/html/pages/device/graphs/fortigate-sessions.inc.php
|
||||
librenms/html/pages/device/graphs/hrprocesses.inc.php
|
||||
librenms/html/pages/device/graphs/hrusers.inc.php
|
||||
librenms/html/pages/device/graphs/ipSytemStats.inc.php
|
||||
librenms/html/pages/device/graphs/laload.inc.php
|
||||
librenms/html/pages/device/graphs/memory.inc.php
|
||||
librenms/html/pages/device/graphs/netstats.inc.php
|
||||
librenms/html/pages/device/graphs/netstats_icmp_info.inc.php
|
||||
@ -2864,6 +2869,7 @@ librenms/includes/discovery/fanspeeds/
|
||||
librenms/includes/discovery/fanspeeds.inc.php
|
||||
librenms/includes/discovery/fanspeeds/areca.inc.php
|
||||
librenms/includes/discovery/fanspeeds/dell.inc.php
|
||||
librenms/includes/discovery/fanspeeds/drac.inc.php
|
||||
librenms/includes/discovery/fanspeeds/equallogic.inc.php
|
||||
librenms/includes/discovery/fanspeeds/lmsensors.inc.php
|
||||
librenms/includes/discovery/fanspeeds/mikrotik.inc.php
|
||||
@ -2918,7 +2924,6 @@ librenms/includes/discovery/os/
|
||||
librenms/includes/discovery/os.inc.php
|
||||
librenms/includes/discovery/os/3com.inc.php
|
||||
librenms/includes/discovery/os/acsw.inc.php
|
||||
librenms/includes/discovery/os/adva.inc.php
|
||||
librenms/includes/discovery/os/airport.inc.php
|
||||
librenms/includes/discovery/os/akcp.inc.php
|
||||
librenms/includes/discovery/os/alcatel-lucent.inc.php
|
||||
@ -2965,6 +2970,7 @@ librenms/includes/discovery/os/freebsd.inc.php
|
||||
librenms/includes/discovery/os/ftos.inc.php
|
||||
librenms/includes/discovery/os/gamatronicups.inc.php
|
||||
librenms/includes/discovery/os/hikvision.inc.php
|
||||
librenms/includes/discovery/os/huaweiups.inc.php
|
||||
librenms/includes/discovery/os/ibmnos.inc.php
|
||||
librenms/includes/discovery/os/ies.inc.php
|
||||
librenms/includes/discovery/os/ios.inc.php
|
||||
@ -2978,6 +2984,10 @@ librenms/includes/discovery/os/konica.inc.php
|
||||
librenms/includes/discovery/os/kyocera.inc.php
|
||||
librenms/includes/discovery/os/liebert.inc.php
|
||||
librenms/includes/discovery/os/linux.inc.php
|
||||
librenms/includes/discovery/os/mellanox.inc.php
|
||||
librenms/includes/discovery/os/merakimr.inc.php
|
||||
librenms/includes/discovery/os/merakims.inc.php
|
||||
librenms/includes/discovery/os/merakimx.inc.php
|
||||
librenms/includes/discovery/os/mgepdu.inc.php
|
||||
librenms/includes/discovery/os/mgeups.inc.php
|
||||
librenms/includes/discovery/os/mrvld.inc.php
|
||||
@ -2990,6 +3000,7 @@ librenms/includes/discovery/os/netopia.inc.php
|
||||
librenms/includes/discovery/os/netscaler.inc.php
|
||||
librenms/includes/discovery/os/netvision.inc.php
|
||||
librenms/includes/discovery/os/netware.inc.php
|
||||
librenms/includes/discovery/os/nos.inc.php
|
||||
librenms/includes/discovery/os/nrg.inc.php
|
||||
librenms/includes/discovery/os/nxos.inc.php
|
||||
librenms/includes/discovery/os/okilan.inc.php
|
||||
@ -3071,6 +3082,7 @@ librenms/includes/discovery/services.inc.php
|
||||
librenms/includes/discovery/states/
|
||||
librenms/includes/discovery/states.inc.php
|
||||
librenms/includes/discovery/states/dell.inc.php
|
||||
librenms/includes/discovery/states/drac.inc.php
|
||||
librenms/includes/discovery/states/dsm.inc.php
|
||||
librenms/includes/discovery/states/equallogic.inc.php
|
||||
librenms/includes/discovery/states/rfc1628.inc.php
|
||||
@ -3090,6 +3102,7 @@ librenms/includes/discovery/temperatures/cisco-envmon.inc.php
|
||||
librenms/includes/discovery/temperatures/ciscowlc.inc.php
|
||||
librenms/includes/discovery/temperatures/cometsystem-p85xx.inc.php
|
||||
librenms/includes/discovery/temperatures/dell.inc.php
|
||||
librenms/includes/discovery/temperatures/drac.inc.php
|
||||
librenms/includes/discovery/temperatures/dsm.inc.php
|
||||
librenms/includes/discovery/temperatures/equallogic.inc.php
|
||||
librenms/includes/discovery/temperatures/fiberhome.inc.php
|
||||
@ -3128,6 +3141,7 @@ librenms/includes/discovery/voltages/
|
||||
librenms/includes/discovery/voltages.inc.php
|
||||
librenms/includes/discovery/voltages/apc.inc.php
|
||||
librenms/includes/discovery/voltages/areca.inc.php
|
||||
librenms/includes/discovery/voltages/drac.inc.php
|
||||
librenms/includes/discovery/voltages/dsm.inc.php
|
||||
librenms/includes/discovery/voltages/gamatronicups.inc.php
|
||||
librenms/includes/discovery/voltages/ipoman.inc.php
|
||||
@ -3270,6 +3284,10 @@ librenms/includes/polling/os/junose.inc.php
|
||||
librenms/includes/polling/os/jwos.inc.php
|
||||
librenms/includes/polling/os/konica.inc.php
|
||||
librenms/includes/polling/os/kyocera.inc.php
|
||||
librenms/includes/polling/os/mellanox.inc.php
|
||||
librenms/includes/polling/os/merakimr.inc.php
|
||||
librenms/includes/polling/os/merakims.inc.php
|
||||
librenms/includes/polling/os/merakimx.inc.php
|
||||
librenms/includes/polling/os/mgeups.inc.php
|
||||
librenms/includes/polling/os/minkelsrms.inc.php
|
||||
librenms/includes/polling/os/multimatic.inc.php
|
||||
@ -3277,6 +3295,7 @@ librenms/includes/polling/os/netapp.inc.php
|
||||
librenms/includes/polling/os/netgear.inc.php
|
||||
librenms/includes/polling/os/netmanplus.inc.php
|
||||
librenms/includes/polling/os/netscaler.inc.php
|
||||
librenms/includes/polling/os/nos.inc.php
|
||||
librenms/includes/polling/os/nrg.inc.php
|
||||
librenms/includes/polling/os/nxos.inc.php
|
||||
librenms/includes/polling/os/okilan.inc.php
|
||||
@ -3341,7 +3360,6 @@ librenms/includes/polling/unix-agent/dmi.inc.php
|
||||
librenms/includes/polling/unix-agent/hddtemp.inc.php
|
||||
librenms/includes/polling/unix-agent/munin-plugins.inc.php
|
||||
librenms/includes/polling/unix-agent/packages.inc.php
|
||||
librenms/includes/polling/ups.inc.php
|
||||
librenms/includes/polling/wifi.inc.php
|
||||
librenms/includes/port-descr-parser.inc.php
|
||||
librenms/includes/rewrites.php
|
||||
@ -3360,8 +3378,12 @@ librenms/includes/services/icmp/
|
||||
librenms/includes/services/icmp/check.inc
|
||||
librenms/includes/services/imap/
|
||||
librenms/includes/services/imap/check.inc
|
||||
librenms/includes/services/ircd/
|
||||
librenms/includes/services/ircd/check.inc
|
||||
librenms/includes/services/mysql/
|
||||
librenms/includes/services/mysql/check.inc
|
||||
librenms/includes/services/ntp/
|
||||
librenms/includes/services/ntp/check.inc
|
||||
librenms/includes/services/pop/
|
||||
librenms/includes/services/pop/check.inc
|
||||
librenms/includes/services/simap/
|
||||
@ -5323,7 +5345,7 @@ librenms/licenses/
|
||||
librenms/licenses/GPLv3-LICENSE.txt
|
||||
librenms/licenses/MIT-LICENSE
|
||||
@mode 775
|
||||
@owner root
|
||||
@owner _librenms
|
||||
@group www
|
||||
librenms/logs/
|
||||
@mode
|
||||
@ -5455,6 +5477,8 @@ librenms/mibs/ATMF-CES
|
||||
librenms/mibs/ATMF-CES-MIB
|
||||
librenms/mibs/AtiL2-MIB
|
||||
librenms/mibs/AtiSwitch-MIB
|
||||
librenms/mibs/BASP-Config-MIB
|
||||
librenms/mibs/BASP-Statistics-MIB
|
||||
librenms/mibs/BAY-STACK-ADAC-MIB
|
||||
librenms/mibs/BAY-STACK-ARP-INSPECTION-MIB
|
||||
librenms/mibs/BAY-STACK-DHCP-SNOOPING-MIB
|
||||
@ -5491,6 +5515,8 @@ librenms/mibs/BROADCOM-POWER-ETHERNET-MIB
|
||||
librenms/mibs/BROADCOM-REF-MIB
|
||||
librenms/mibs/BROCADE-NP-TM-STATS-MIB
|
||||
librenms/mibs/BROCADE-SYSLOG-MIB
|
||||
librenms/mibs/Brcm-BASPTrap-MIB
|
||||
librenms/mibs/Brcm-adapterInfo-MIB
|
||||
librenms/mibs/Brocade-REG-MIB
|
||||
librenms/mibs/CABLETRON-TRAPS
|
||||
librenms/mibs/CABLETRON-TRAPS-IRM
|
||||
@ -5551,6 +5577,9 @@ librenms/mibs/CISCO-IPSEC-FLOW-MONITOR-MIB
|
||||
librenms/mibs/CISCO-ISDN-MIB
|
||||
librenms/mibs/CISCO-L2L3-INTERFACE-CONFIG-MIB
|
||||
librenms/mibs/CISCO-LAG-MIB
|
||||
librenms/mibs/CISCO-LWAPP-DOT11-CLIENT-MIB
|
||||
librenms/mibs/CISCO-LWAPP-SYS-MIB
|
||||
librenms/mibs/CISCO-LWAPP-TC-MIB
|
||||
librenms/mibs/CISCO-MAC-NOTIFICATION-MIB
|
||||
librenms/mibs/CISCO-MEDIA-GATEWAY-MIB
|
||||
librenms/mibs/CISCO-MEMORY-POOL-MIB
|
||||
@ -5815,6 +5844,9 @@ librenms/mibs/CYCLADES-MIB
|
||||
librenms/mibs/DATA-DMSWITCH.mib
|
||||
librenms/mibs/DATACOM-REG.mib
|
||||
librenms/mibs/DATACOM-SMI.mib
|
||||
librenms/mibs/DCS3FRU-MIB
|
||||
librenms/mibs/DCS3RMT-MIB
|
||||
librenms/mibs/DELL-ASF-MIB
|
||||
librenms/mibs/DELL-RAC-MIB
|
||||
librenms/mibs/DEVBASE-MIB
|
||||
librenms/mibs/DEVCONTROL-MIB
|
||||
@ -6067,6 +6099,8 @@ librenms/mibs/IANA-RTPROTO-MIB
|
||||
librenms/mibs/IANAifType-MIB
|
||||
librenms/mibs/ICF-ETWIST
|
||||
librenms/mibs/ICF-VG-RPTR
|
||||
librenms/mibs/IDRAC-MIB
|
||||
librenms/mibs/IDRAC-MIB-SMIv2
|
||||
librenms/mibs/IEEE-802DOT17-RPR-MIB
|
||||
librenms/mibs/IEEE8021-BRIDGE-MIB
|
||||
librenms/mibs/IEEE8021-CFM-MIB
|
||||
@ -6081,6 +6115,7 @@ librenms/mibs/IGMP-MIB
|
||||
librenms/mibs/IGMP-STD-MIB
|
||||
librenms/mibs/INET-ADDRESS-MIB
|
||||
librenms/mibs/INTEGRATED-SERVICES-MIB
|
||||
librenms/mibs/INTEL-LAN-ADAPTERS-MIB
|
||||
librenms/mibs/IP-FORWARD-MIB
|
||||
librenms/mibs/IP-MIB
|
||||
librenms/mibs/IPMROUTE-MIB
|
||||
@ -6120,6 +6155,8 @@ librenms/mibs/MAU-MIB
|
||||
librenms/mibs/MB-MIB
|
||||
librenms/mibs/MG-SNMP-UPS-MIB
|
||||
librenms/mibs/MIB-DELL-10892
|
||||
librenms/mibs/MIB-Dell-CM
|
||||
librenms/mibs/MIB-Dell-OME
|
||||
librenms/mibs/MIKROTIK-MIB
|
||||
librenms/mibs/MPLS-L3VPN-STD-MIB
|
||||
librenms/mibs/MPLS-LDP-CAPABILITY
|
||||
@ -7296,8 +7333,8 @@ librenms/poller-wrapper.py
|
||||
librenms/poller.php
|
||||
librenms/renamehost.php
|
||||
@mode 775
|
||||
@owner root
|
||||
@group www
|
||||
@owner _librenms
|
||||
@group _librenms
|
||||
librenms/rrd/
|
||||
@mode
|
||||
@owner
|
||||
@ -7420,6 +7457,7 @@ librenms/sql-schema/053.sql
|
||||
librenms/sql-schema/054.sql
|
||||
librenms/sql-schema/055.sql
|
||||
librenms/sql-schema/056.sql
|
||||
librenms/sql-schema/057.sql
|
||||
librenms/syslog.php
|
||||
librenms/upgrade-scripts/
|
||||
librenms/upgrade-scripts/fix-billing-2758.inc.php
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: README,v 1.4 2015/07/06 11:25:36 sthen Exp $
|
||||
$OpenBSD: README,v 1.5 2015/07/16 02:50:33 sthen Exp $
|
||||
|
||||
+-----------------------------------------------------------------------
|
||||
| Running ${FULLPKGNAME} on OpenBSD
|
||||
@ -119,7 +119,7 @@ chown root ${INSTDIR} # protect again
|
||||
Periodic tasks
|
||||
==============
|
||||
Cron jobs are used to discover and poll hosts, send alerts, and carry out
|
||||
other housekeeping. Samples are provided in ${INSTDIR}/librenms.cron
|
||||
other housekeeping. Samples are provided in ${INSTDIR}/librenms.nonroot.cron
|
||||
and should be added to /etc/crontab (creating the file if necessary).
|
||||
The parameter to poller-wrapper.py sets the number of threads running
|
||||
SNMP queries in parallel; you may need to adjust this e.g. if you fetch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user