svn commit: r366153 - in head/sysutils/rubygem-fluentd: . files
Steve Wills
swills at FreeBSD.org
Mon Aug 25 21:16:57 UTC 2014
Author: swills
Date: Mon Aug 25 21:16:56 2014
New Revision: 366153
URL: http://svnweb.freebsd.org/changeset/ports/366153
QAT: https://qat.redports.org/buildarchive/r366153/
Log:
sysutils/rubygem-fluentd: update to 0.10.53, unbreak, use new rubygem-cool.io
With hat: ruby@
Added:
head/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample (contents, props changed)
Modified:
head/sysutils/rubygem-fluentd/Makefile
head/sysutils/rubygem-fluentd/distinfo
head/sysutils/rubygem-fluentd/files/fluentd.in
Modified: head/sysutils/rubygem-fluentd/Makefile
==============================================================================
--- head/sysutils/rubygem-fluentd/Makefile Mon Aug 25 21:03:08 2014 (r366152)
+++ head/sysutils/rubygem-fluentd/Makefile Mon Aug 25 21:16:56 2014 (r366153)
@@ -1,31 +1,34 @@
# $FreeBSD$
PORTNAME= fluentd
-PORTVERSION= 0.10.35
+PORTVERSION= 0.10.53
CATEGORIES= sysutils rubygems
MASTER_SITES= RG
MAINTAINER= kuriyama at FreeBSD.org
COMMENT= Fluent event collector
-BROKEN= Requires http_parser version 0.5.1 while version 0.6 is installed
-
RUN_DEPENDS= \
- rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack \
+ rubygem-cool.io>=1.1.1:${PORTSDIR}/devel/rubygem-cool.io \
+ rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \
rubygem-json>=1.4.3:${PORTSDIR}/devel/rubygem-json \
- rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby \
- rubygem-cool.io>=1.1.0:${PORTSDIR}/devel/rubygem-cool.io \
- rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb
+ rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack \
+ rubygem-sigdump>=0.2.2:${PORTSDIR}/devel/rubygem-sigdump \
+ rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
USE_RUBY= yes
USE_RUBYGEMS= yes
PLIST_FILES= bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \
- "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 775 /var/run/fluentd" \
- "@unexec ${RMDIR} /var/run/fluentd 2>/dev/null || true"
+ "@sample etc/fluentd/fluent.conf.sample"
+PLIST_DIRS= etc/fluentd/plugin etc/fluentd
RUBYGEM_AUTOPLIST= yes
USE_RC_SUBR= fluentd
USERS= fluentd
GROUPS= fluentd
-SUB_LIST+= USER=${USERS} GROUP=${GROUPS}
+SUB_LIST+= USER=${USERS} GROUP=${GROUPS} RUBY=${RUBY}
+
+post-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fluentd/plugin
+ ${CP} ${WRKSRC}/fluent.conf.sample ${STAGEDIR}${PREFIX}/etc/fluentd/
.include <bsd.port.mk>
Modified: head/sysutils/rubygem-fluentd/distinfo
==============================================================================
--- head/sysutils/rubygem-fluentd/distinfo Mon Aug 25 21:03:08 2014 (r366152)
+++ head/sysutils/rubygem-fluentd/distinfo Mon Aug 25 21:16:56 2014 (r366153)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/fluentd-0.10.35.gem) = 97fc77adb60a7f24de95d26aaf01cb74fcfce560297f26e0c7f5a1d1d0038209
-SIZE (rubygem/fluentd-0.10.35.gem) = 63488
+SHA256 (rubygem/fluentd-0.10.53.gem) = bd64d1d554d17b9c6ccbd8ca4a6093e025df9aeb050d411c48528e0297dc8623
+SIZE (rubygem/fluentd-0.10.53.gem) = 111616
Modified: head/sysutils/rubygem-fluentd/files/fluentd.in
==============================================================================
--- head/sysutils/rubygem-fluentd/files/fluentd.in Mon Aug 25 21:03:08 2014 (r366152)
+++ head/sysutils/rubygem-fluentd/files/fluentd.in Mon Aug 25 21:16:56 2014 (r366153)
@@ -13,7 +13,6 @@
# Set it to YES to enable fluentd.
# fluentd_config (path): Set to %%PREFIX%%/etc/fluentd/fluent.conf
# by default.
-# fluentd_db_dir (path): Set DB dir (default: "/var/db/fluentd")
# fluentd_flags (str): Set to "" by default.
. /etc/rc.subr
@@ -31,7 +30,7 @@ load_rc_config $name
: ${fluentd_group="%%GROUP%%"}
: ${fluentd_flags:=""}
-init_cmd="init_fluentd_dir"
+start_precmd="fluentd_start_precmd"
command=%%PREFIX%%/bin/${name}
pidfile=/var/run/${name}/${name}.pid
@@ -39,12 +38,10 @@ command_interpreter=%%RUBY%%
command_args="-d $pidfile -c $fluentd_config"
-init_fluentd_dir()
+fluentd_start_precmd()
{
- # XXX: Using sudo for now. fluentd user have /nonexistent as
- # $HOME, and nologin as shell.
install -d -o ${fluentd_user} -g ${fluentd_group} -m 775 ${fluentd_dir}
- %%PREFIX%%/bin/sudo -u fluentd ${command} --setup ${fluentd_dir}
+ install -d -o ${fluentd_user} -g ${fluentd_group} -m 775 /var/run/fluentd
}
run_rc_command "$1"
Added: head/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample Mon Aug 25 21:16:56 2014 (r366153)
@@ -0,0 +1,103 @@
+--- ./fluent.conf.sample.orig 2014-08-25 20:24:20.865112521 +0000
++++ ./fluent.conf.sample 2014-08-25 20:23:48.360114719 +0000
+@@ -0,0 +1,100 @@
++
++## built-in TCP input
++## $ echo <json> | fluent-cat <tag>
++<source>
++ type forward
++</source>
++
++## built-in UNIX socket input
++#<source>
++# type unix
++#</source>
++
++# HTTP input
++# http://localhost:8888/<tag>?json=<json>
++<source>
++ type http
++ port 8888
++</source>
++
++## File input
++## read apache logs with tag=apache.access
++#<source>
++# type tail
++# format apache
++# path /var/log/httpd-access.log
++# tag apache.access
++#</source>
++
++# Listen HTTP for monitoring
++# http://localhost:24220/api/plugins
++# http://localhost:24220/api/plugins?type=TYPE
++# http://localhost:24220/api/plugins?tag=MYTAG
++<source>
++ type monitor_agent
++ port 24220
++</source>
++
++# Listen DRb for debug
++<source>
++ type debug_agent
++ bind 127.0.0.1
++ port 24230
++</source>
++
++
++## match tag=apache.access and write to file
++#<match apache.access>
++# type file
++# path /var/log/fluent/access
++#</match>
++
++## match tag=debug.** and dump to console
++<match debug.**>
++ type stdout
++</match>
++
++# match tag=system.** and forward to another fluent server
++<match system.**>
++ type forward
++ <server>
++ host 192.168.0.11
++ </server>
++ <secondary>
++ <server>
++ host 192.168.0.12
++ </server>
++ </secondary>
++</match>
++
++## match tag=myapp.** and forward and write to file
++#<match myapp.**>
++# type copy
++# <store>
++# type forward
++# buffer_type file
++# buffer_path /var/log/fluent/myapp-forward
++# retry_limit 50
++# flush_interval 10s
++# <server>
++# host 192.168.0.13
++# </server>
++# </store>
++# <store>
++# type file
++# path /var/log/fluent/myapp
++# </store>
++#</match>
++
++## match fluent's internal events
++#<match fluent.**>
++# type null
++#</match>
++
++## match not matched logs and write to file
++#<match **>
++# type file
++# path /var/log/fluent/else
++# compress gz
++#</match>
++
More information about the svn-ports-head
mailing list