Date: Tue, 15 Sep 2015 08:52:05 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396947 - in head/net-mgmt/librenms: . files Message-ID: <201509150852.t8F8q5ch071329@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Tue Sep 15 08:52:04 2015 New Revision: 396947 URL: https://svnweb.freebsd.org/changeset/ports/396947 Log: net-mgmt/librenms: Update version 201506=>201509 [1] - Correct the path of fping [1] - Make proper use of OPTIONSNG PR: 202938 [1] Submitted by: dvl [1] Differential Revision: https://reviews.freebsd.org/D3578 [1] Modified: head/net-mgmt/librenms/Makefile head/net-mgmt/librenms/distinfo head/net-mgmt/librenms/files/patch-config.php.default head/net-mgmt/librenms/files/patch-includes_defaults.inc.php Modified: head/net-mgmt/librenms/Makefile ============================================================================== --- head/net-mgmt/librenms/Makefile Tue Sep 15 07:40:27 2015 (r396946) +++ head/net-mgmt/librenms/Makefile Tue Sep 15 08:52:04 2015 (r396947) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 201506 +PORTVERSION= 201509 CATEGORIES= net-mgmt MASTER_SITES= http://www.librenms.org/ @@ -46,8 +46,8 @@ RUN_DEPENDS+= rrdtool:${PORTSDIR}/databa snmpget:${PORTSDIR}/net-mgmt/net-snmp \ bash:${PORTSDIR}/shells/bash -OPTIONS_DEFINE= APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER WMIC -OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC +OPTIONS_DEFINE= APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES +OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES APACHEMOD_DESC= Use PHP with Apache 2.2+ module FPING_DESC= Enable fping support ping monitoring IPMITOOL_DESC= Enable support for monitoring hardware IPMI @@ -65,29 +65,26 @@ WMIC_RUN_DEPENDS= wmic:${PORTSDIR}/net-m MYSQLD_USE= MYSQL=server MYSQLD_USE_OFF= MYSQL=client -.include <bsd.port.options.mk> - SUB_FILES+= pkg-message 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= * PORTEXAMPLES= snmp.conf.example snmpd.conf.example NO_ARCH= yes -.if ${PORT_OPTIONS:MAPACHEMOD} && !defined(PACKAGE_BUILDING) -WANT_PHP_MOD= yes -USE_APACHE_RUN= 22+ +.if !defined(PACKAGE_BUILDING) +APACHEMOD_VARS_ON= WANT_PHP_MOD=yes +APACHEMOD_USE= APACHE_RUN=22+ .else # Package builder doesn't create php5 with module WANT_PHP_WEB= yes @@ -113,21 +110,19 @@ do-install: # Ensure PHP and Python scripts are executable @${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \ '*.php' -exec ${CHMOD} +x {} \; -# Rename for @sample -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}/${DOCSDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR} .endfor @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR} .endfor -.endif post-install: @${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST} Modified: head/net-mgmt/librenms/distinfo ============================================================================== --- head/net-mgmt/librenms/distinfo Tue Sep 15 07:40:27 2015 (r396946) +++ head/net-mgmt/librenms/distinfo Tue Sep 15 08:52:04 2015 (r396947) @@ -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 Modified: head/net-mgmt/librenms/files/patch-config.php.default ============================================================================== --- head/net-mgmt/librenms/files/patch-config.php.default Tue Sep 15 07:40:27 2015 (r396946) +++ head/net-mgmt/librenms/files/patch-config.php.default Tue Sep 15 08:52:04 2015 (r396947) @@ -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 Modified: head/net-mgmt/librenms/files/patch-includes_defaults.inc.php ============================================================================== --- head/net-mgmt/librenms/files/patch-includes_defaults.inc.php Tue Sep 15 07:40:27 2015 (r396946) +++ head/net-mgmt/librenms/files/patch-includes_defaults.inc.php Tue Sep 15 08:52:04 2015 (r396947) @@ -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"; - - // What is my own hostname (used to identify this host in its own database) -@@ -39,26 +39,26 @@ $config['own_hostname'] = "localhost"; + $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'; + + // 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/sbin/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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509150852.t8F8q5ch071329>