mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

- Add missing dependency on www/p5-libwww [1]

Browse Source 
- Fix fail2ban's path [2] (while there, make plugins.conf PREFIX safe)
- Fix multiping plugin [3] (while there, regenerate patches)
- Add a forgotten run dep on Java.

PR:		192341 [1]
Submitted by:	fbsd@shoggothmedia.com [1]
PR:		179549 [2]
Submitted by:	fabian@bug.ch [2]
PR:		192332 [3]
Submitted by:	fbsd@shoggothmedia.com [3]
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2014-09-03 07:28:40 +00:00
parent 11d3c4cc40
commit 7cfb172ecf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=367171
9 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/munin-node/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= munin
PORTVERSION= ${MUNIN_VERSION}
PORTREVISION= 1
CATEGORIES= sysutils perl5
MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -node
@ -20,6 +21,7 @@ RUN_DEPENDS= p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
munin-common>=0:${PORTSDIR}/sysutils/munin-common \
p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
bash:${PORTSDIR}/shells/bash
USES= gmake perl5 shebangfix
@ -46,8 +48,9 @@ SNMP_RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
JAVA_USE= java=yes
JAVA_INSTALL_TARGET= install-plugins-java
JAVA_BUILD= yes
JAVA_RUN= yes
SUB_FILES= pkg-message
SUB_FILES= pkg-message plugins.conf
USE_RC_SUBR= munin-node munin-sched
post-patch:
@ -70,7 +73,7 @@ post-install:
${STAGEDIR}${PREFIX}/etc/rc.d/munin-node
${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
${STAGEDIR}${ETCDIR}/munin-node.conf.sample
${INSTALL_DATA} ${FILESDIR}/plugins.conf \
${INSTALL_DATA} ${WRKDIR}/plugins.conf \
${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample
(cd ${WRKSRC}/node/blib/bindoc; \
${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \

2
sysutils/munin-node/files/patch-node__munin-node.conf.in
View File

@ -1,4 +1,4 @@
--- node/munin-node.conf.in.orig 2013-07-19 16:30:03 UTC
--- node/munin-node.conf.in.orig 2014-04-22 19:29:32 UTC
+++ node/munin-node.conf.in
@@ -10,7 +10,7 @@
setsid 1

2
sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in
View File

@ -1,4 +1,4 @@
--- plugins/node.d.freebsd/if_.in.orig 2013-07-19 16:30:03 UTC
--- plugins/node.d.freebsd/if_.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d.freebsd/if_.in
@@ -83,9 +83,12 @@
if (NF == 10) {

2
sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in
View File

@ -1,4 +1,4 @@
--- plugins/node.d.freebsd/if_errcoll_.in.orig 2013-07-19 16:30:03 UTC
--- plugins/node.d.freebsd/if_errcoll_.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d.freebsd/if_errcoll_.in
@@ -59,9 +59,13 @@
print "ierrors.value", $5;

2
sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
View File

@ -1,4 +1,4 @@
--- plugins/node.d.freebsd/iostat.in.orig 2013-07-19 16:30:03 UTC
--- plugins/node.d.freebsd/iostat.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d.freebsd/iostat.in
@@ -56,13 +56,11 @@
for d in $drives; do

2
sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
View File

@ -1,4 +1,4 @@
--- plugins/node.d/hddtemp_smartctl.in.orig 2013-07-19 16:30:03 UTC
--- plugins/node.d/hddtemp_smartctl.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d/hddtemp_smartctl.in
@@ -162,7 +162,7 @@

10
sysutils/munin-node/files/patch-plugins__node.d__multiping.in Normal file
View File

@ -0,0 +1,10 @@
--- plugins/node.d/multiping.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d/multiping.in
@@ -59,6 +59,7 @@
host=${host:-${file_host:-www.google.com}}
fi
+site=0
if [ "$1" = "config" ]; then
echo graph_title Ping times
echo 'graph_args --base 1000 -l 0'

2
sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
View File

@ -1,4 +1,4 @@
--- plugins/node.d/squeezebox_.in.orig 2013-07-19 16:30:03 UTC
--- plugins/node.d/squeezebox_.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d/squeezebox_.in
@@ -157,7 +157,7 @@
printf "graph_order y"

20
sysutils/munin-node/files/plugins.conf → sysutils/munin-node/files/plugins.conf.in
View File

@ -21,30 +21,30 @@
[amavis]
env.amavislog /var/log/maillog
env.logtail /usr/local/bin/logtail
env.logtail %%LOCALBASE%%/bin/logtail
[courier_*]
env.logfile /var/log/maillog
env.logtail /usr/local/bin/logtail
env.logtail %%LOCALBASE%%/bin/logtail
[dhcp3]
env.configfile /usr/local/etc/dhcpd.conf
env.configfile %%LOCALBASE%%/etc/dhcpd.conf
env.leasefile /var/db/dhcpd.leases
[exim*]
group mail
env.exim /usr/local/sbin/exim
env.exim %%LOCALBASE%%/sbin/exim
[hddtemp_smartctl]
group operator
env.smartctl /usr/local/sbin/smartctl
env.smartctl %%LOCALBASE%%/sbin/smartctl
[mbmon*]
env.mbmon /usr/local/bin/mbmon
env.mbmon %%LOCALBASE%%/bin/mbmon
[mysql*]
env.mysqladmin /usr/local/bin/mysqladmin
env.mysqlshow /usr/local/bin/mysqlshow
env.mysqladmin %%LOCALBASE%%/bin/mysqladmin
env.mysqlshow %%LOCALBASE%%/bin/mysqlshow
[postfix*]
user root
@ -53,3 +53,7 @@ env.logfile maillog
[sendmail*]
env.mspqueue /var/spool/clientmqueue
env.mailstats /usr/sbin/mailstats
[fail2ban*]
user root
env.client %%LOCALBASE%%/bin/fail2ban-client