View | Details | Raw Unified | Return to bug 202938 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +5 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	librenms
4
PORTNAME=	librenms
5
PORTVERSION=	201506
5
PORTVERSION=	201509
6
CATEGORIES=	net-mgmt
6
CATEGORIES=	net-mgmt
7
MASTER_SITES=	http://www.librenms.org/
7
MASTER_SITES=	http://www.librenms.org/
8
8
Lines 71-84 Link Here
71
SUB_LIST+=	PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD}
71
SUB_LIST+=	PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD}
72
72
73
ROOT_FILES=	addhost.php adduser.php	alerts.php build-base.php build.sql \
73
ROOT_FILES=	addhost.php adduser.php	alerts.php build-base.php build.sql \
74
	       	billing-calculate.php callback.php check-errors.php \
74
	       	billing-calculate.php callback.php \
75
	       	check-services.php config_to_json.php daily.php daily.sh \
75
	       	check-services.php config_to_json.php daily.php daily.sh \
76
	       	delhost.php discovery.php dist-pollers.php irc.php \
76
	       	delhost.php discovery.php dist-pollers.php irc.php \
77
	       	poll-billing.php poller.php poller-wrapper.py renamehost.php \
77
	       	poll-billing.php poller.php poller-service.py poller-wrapper.py renamehost.php \
78
		snmptrap.php syslog.php	validate.php
78
		snmp-scan.php snmptrap.php syslog.php validate.php
79
79
80
ROOT_DIRS=	contrib html includes lib mibs scripts sql-schema \
80
ROOT_DIRS=	contrib html includes lib mibs scripts sql-schema
81
	       	upgrade-scripts
82
81
83
DOCS=		AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md
82
DOCS=		AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md
84
PORTDOCS=	*
83
PORTDOCS=	*
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (librenms-librenms-201506_GH0.tar.gz) = 7618b02292847d1a308cd6bd0649eb386e87d2fbac1e0991914cea6383a540df
1
SHA256 (librenms-librenms-201509_GH0.tar.gz) = 920f8ede391f532ffb53e9fb481386506d4bfaf211601d5ca3a759e99dccbfea
2
SIZE (librenms-librenms-201506_GH0.tar.gz) = 23898595
2
SIZE (librenms-librenms-201509_GH0.tar.gz) = 28524457
(-)files/patch-config.php.default (-2 / +2 lines)
Lines 1-6 Link Here
1
--- config.php.default.orig	2015-06-15 14:48:46 UTC
1
--- config.php.default.orig	2015-09-06 16:13:08 UTC
2
+++ config.php.default
2
+++ config.php.default
3
@@ -14,7 +14,7 @@ $config['memcached']['host']    = "local
3
@@ -15,7 +15,7 @@ $config['memcached']['host']    = "local
4
 $config['memcached']['port']    = 11211;
4
 $config['memcached']['port']    = 11211;
5
 
5
 
6
 ### Locations - it is recommended to keep the default
6
 ### Locations - it is recommended to keep the default
(-)files/patch-includes_defaults.inc.php (-46 / +40 lines)
Lines 1-55 Link Here
1
--- includes/defaults.inc.php.orig	2015-06-15 11:23:55 UTC
1
--- includes/defaults.inc.php.orig	2015-09-06 18:47:34 UTC
2
+++ includes/defaults.inc.php
2
+++ includes/defaults.inc.php
3
@@ -31,7 +31,7 @@ $config['project_name']     = "LibreNMS"
3
@@ -40,7 +40,7 @@ $config['project_name'] = 'LibreNMS';
4
 $config['project_id']     = strtolower($config['project_name']);
4
 $config['project_id']   = strtolower($config['project_name']);
5
 
5
 
6
 $config['temp_dir']      = "/tmp";
6
 $config['temp_dir']    = '/tmp';
7
-$config['install_dir']   = "/opt/" . $config['project_id'];
7
-$config['install_dir'] = '/opt/'.$config['project_id'];
8
+$config['install_dir']   = "/usr/local/www/" . $config['project_id'];
8
+$config['install_dir'] = '/usr/local/www/' . $config['project_id'];
9
 $config['log_dir']       = $config['install_dir'] . "/logs";
9
 $config['log_dir']     = $config['install_dir'].'/logs';
10
 
10
 
11
 // What is my own hostname (used to identify this host in its own database)
11
 // MySQL extension to use
12
@@ -39,26 +39,26 @@ $config['own_hostname'] = "localhost";
12
@@ -50,24 +50,24 @@ $config['db']['extension']       = 'mysq
13
 $config['own_hostname'] = 'localhost';
13
 
14
 
14
 // Location of executables
15
 // Location of executables
15
 
16
-$config['rrdtool']                  = '/usr/bin/rrdtool';
16
-$config['rrdtool']          = "/usr/bin/rrdtool";
17
-$config['fping']                    = '/usr/bin/fping';
17
-$config['fping']            = "/usr/bin/fping";
18
+$config['rrdtool']                  = '/usr/local/bin/rrdtool';
18
+$config['rrdtool']          = "/usr/local/bin/rrdtool";
19
+$config['fping']                    = '/usr/local/fping';
19
+$config['fping']            = "/usr/local/sbin/fping";
20
 $config['fping_options']['retries'] = 3;
20
 $config['fping_options']['retries'] = 3;
21
 $config['fping_options']['timeout'] = 500;
21
 $config['fping_options']['timeout'] = 500;
22
-$config['fping6']           = "/usr/bin/fping6";
22
 $config['fping_options']['count']   = 3;
23
-$config['snmpwalk']         = "/usr/bin/snmpwalk";
23
 $config['fping_options']['millisec'] = 200;
24
-$config['snmpget']          = "/usr/bin/snmpget";
24
-$config['snmpwalk']                  = '/usr/bin/snmpwalk';
25
-$config['snmpbulkwalk']     = "/usr/bin/snmpbulkwalk";
25
-$config['snmpget']                   = '/usr/bin/snmpget';
26
+$config['fping6']           = "/usr/local/sbin/fping6";
26
-$config['snmpbulkwalk']              = '/usr/bin/snmpbulkwalk';
27
+$config['snmpwalk']         = "/usr/local/bin/snmpwalk";
27
+$config['snmpwalk']                  = '/usr/local/bin/snmpwalk';
28
+$config['snmpget']          = "/usr/local/bin/snmpget";
28
+$config['snmpget']                   = '/usr/local/bin/snmpget';
29
+$config['snmpbulkwalk']     = "/usr/local/bin/snmpbulkwalk";
29
+$config['snmpbulkwalk']              = '/usr/local/bin/snmpbulkwalk';
30
 $config['whois']            = "/usr/bin/whois";
30
 $config['whois']          = '/usr/bin/whois';
31
-$config['ping']             = "/bin/ping";
31
-$config['ping']           = '/bin/ping';
32
-$config['mtr']              = "/usr/bin/mtr";
32
-$config['mtr']            = '/usr/bin/mtr';
33
-$config['nmap']             = "/usr/bin/nmap";
33
-$config['nmap']           = '/usr/bin/nmap';
34
-$config['nagios_plugins']   = "/usr/lib/nagios/plugins";
34
-$config['nagios_plugins'] = '/usr/lib/nagios/plugins';
35
-$config['ipmitool']         = "/usr/bin/ipmitool";
35
-$config['ipmitool']       = '/usr/bin/ipmitool';
36
-$config['virsh']            = "/usr/bin/virsh";
36
-$config['virsh']          = '/usr/bin/virsh';
37
-$config['dot']              = "/usr/bin/dot";
37
-$config['dot']            = '/usr/bin/dot';
38
-$config['unflatten']        = "/usr/bin/unflatten";
38
-$config['sfdp']           = '/usr/bin/sfdp';
39
-$config['neato']            = "/usr/bin/neato";
39
+$config['ping']           = '/sbin/ping';
40
-$config['sfdp']             = "/usr/bin/sfdp";
40
+$config['mtr']            = '/usr/local/bin/mtr';
41
-$config['svn']              = "/usr/bin/svn";
41
+$config['nmap']           = '/usr/local/bin/nmap';
42
+$config['ping']             = "/sbin/ping";
42
+$config['nagios_plugins'] = '/usr/local/libexec/nagios';
43
+$config['mtr']              = "/usr/local/bin/mtr";
43
+$config['ipmitool']       = '/usr/local/bin/ipmitool';
44
+$config['nmap']             = "/usr/local/bin/nmap";
44
+$config['virsh']          = '/usr/local/bin/virsh';
45
+$config['nagios_plugins']   = "/usr/local/libexec/nagios";
45
+$config['dot']            = '/usr/local/bin/dot';
46
+$config['ipmitool']         = "/usr/local/bin/ipmitool";
46
+$config['sfdp']           = '/usr/local/bin/sfdp';
47
+$config['virsh']            = "/usr/local/bin/virsh";
48
+$config['dot']              = "/usr/local/bin/dot";
49
+$config['unflatten']        = "/usr/local/bin/unflatten";
50
+$config['neato']            = "/usr/local/bin/neato";
51
+$config['sfdp']             = "/usr/local/bin/sfdp";
52
+$config['svn']              = "/usr/bin/svnlite";
53
 
47
 
54
 // Memcached - Keep immediate statistics
48
 // Memcached - Keep immediate statistics
55
 
49
 $config['memcached']['enable'] = false;

Return to bug 202938