FreeBSD Bugzilla – Attachment 160785 Details for
Bug 202938
net-mgmt/librenms - upgrade to 201509
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for 201509
librenms-201509.diff (text/plain), 7.15 KB, created by
Dan Langille
on 2015-09-06 21:01:16 UTC
(
hide
)
Description:
patch for 201509
Filename:
MIME Type:
Creator:
Dan Langille
Created:
2015-09-06 21:01:16 UTC
Size:
7.15 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 396228) >+++ Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= librenms >-PORTVERSION= 201506 >+PORTVERSION= 201509 > CATEGORIES= net-mgmt > MASTER_SITES= http://www.librenms.org/ > >@@ -71,14 +71,13 @@ > SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD} > > ROOT_FILES= addhost.php adduser.php alerts.php build-base.php build.sql \ >- billing-calculate.php callback.php check-errors.php \ >+ billing-calculate.php callback.php \ > check-services.php config_to_json.php daily.php daily.sh \ > delhost.php discovery.php dist-pollers.php irc.php \ >- poll-billing.php poller.php poller-wrapper.py renamehost.php \ >- snmptrap.php syslog.php validate.php >+ poll-billing.php poller.php poller-service.py poller-wrapper.py renamehost.php \ >+ snmp-scan.php snmptrap.php syslog.php validate.php > >-ROOT_DIRS= contrib html includes lib mibs scripts sql-schema \ >- upgrade-scripts >+ROOT_DIRS= contrib html includes lib mibs scripts sql-schema > > DOCS= AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md > PORTDOCS= * >Index: distinfo >=================================================================== >--- distinfo (revision 396228) >+++ distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (librenms-librenms-201506_GH0.tar.gz) = 7618b02292847d1a308cd6bd0649eb386e87d2fbac1e0991914cea6383a540df >-SIZE (librenms-librenms-201506_GH0.tar.gz) = 23898595 >+SHA256 (librenms-librenms-201509_GH0.tar.gz) = 920f8ede391f532ffb53e9fb481386506d4bfaf211601d5ca3a759e99dccbfea >+SIZE (librenms-librenms-201509_GH0.tar.gz) = 28524457 >Index: files/patch-config.php.default >=================================================================== >--- files/patch-config.php.default (revision 396228) >+++ files/patch-config.php.default (working copy) >@@ -1,6 +1,6 @@ >---- config.php.default.orig 2015-06-15 14:48:46 UTC >+--- config.php.default.orig 2015-09-06 16:13:08 UTC > +++ config.php.default >-@@ -14,7 +14,7 @@ $config['memcached']['host'] = "local >+@@ -15,7 +15,7 @@ $config['memcached']['host'] = "local > $config['memcached']['port'] = 11211; > > ### Locations - it is recommended to keep the default >Index: files/patch-includes_defaults.inc.php >=================================================================== >--- files/patch-includes_defaults.inc.php (revision 396228) >+++ files/patch-includes_defaults.inc.php (working copy) >@@ -1,55 +1,49 @@ >---- includes/defaults.inc.php.orig 2015-06-15 11:23:55 UTC >+--- includes/defaults.inc.php.orig 2015-09-06 18:47:34 UTC > +++ includes/defaults.inc.php >-@@ -31,7 +31,7 @@ $config['project_name'] = "LibreNMS" >- $config['project_id'] = strtolower($config['project_name']); >+@@ -40,7 +40,7 @@ $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'] = "/usr/local/www/" . $config['project_id']; >- $config['log_dir'] = $config['install_dir'] . "/logs"; >+ $config['temp_dir'] = '/tmp'; >+-$config['install_dir'] = '/opt/'.$config['project_id']; >++$config['install_dir'] = '/usr/local/www/' . $config['project_id']; >+ $config['log_dir'] = $config['install_dir'].'/logs'; > >- // What is my own hostname (used to identify this host in its own database) >-@@ -39,26 +39,26 @@ $config['own_hostname'] = "localhost"; >+ // MySQL extension to use >+@@ -50,24 +50,24 @@ $config['db']['extension'] = 'mysq >+ $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/fping'; > $config['fping_options']['retries'] = 3; > $config['fping_options']['timeout'] = 500; >--$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/bin/mtr"; >-+$config['nmap'] = "/usr/local/bin/nmap"; >-+$config['nagios_plugins'] = "/usr/local/libexec/nagios"; >-+$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/bin/svnlite"; >+ $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['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['sfdp'] = '/usr/bin/sfdp'; >++$config['ping'] = '/sbin/ping'; >++$config['mtr'] = '/usr/local/bin/mtr'; >++$config['nmap'] = '/usr/local/bin/nmap'; >++$config['nagios_plugins'] = '/usr/local/libexec/nagios'; >++$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;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=160785">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 202938
:
160785
|
160812