Date: Wed, 12 Oct 2011 18:14:51 GMT From: Evan Sarmiento <bsdports@wayfair.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/161521: Submission of NEW databases/py-carbon port Message-ID: <201110121814.p9CIEpPe011885@red.freebsd.org> Resent-Message-ID: <201110121820.p9CIK5hk076855@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161521 >Category: ports >Synopsis: Submission of NEW databases/py-carbon port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 12 18:20:05 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Evan Sarmiento >Release: 8.2-PRERELEASE >Organization: Wayfair >Environment: FreeBSD csn-mgmt.csnzoo.com 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #2: Wed Dec 15 14:34:42 EST 2010 root@csn-mgmt.csnzoo.com:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Py-carbon 0.9.9. esarmiento@wayfair.com / bsdports@wayfair.com will be maintainer. Works on 8.2-REL and 8.2-STABLE built using Tinderbox and deployed to production systems. >How-To-Repeat: There is no databases/py-carbon in the ports tree. >Fix: (cd /usr/ports/databases && patch -p0 < py-carbon.diff.txt) Patch attached with submission follows: diff -ruN py-carbon-2/Makefile py-carbon/Makefile --- py-carbon-2/Makefile 1969-12-31 19:00:00.000000000 -0500 +++ py-carbon/Makefile 2011-10-11 13:57:42.000000000 -0400 @@ -0,0 +1,28 @@ +# New ports collection makefile for: py-carbon +# Date created: 2011-05-01 +# Whom: Dan Rowe/Evan Sarmiento <bsdports@wayfair.com> +# +# $FreeBSD: $id$ +# + +PORTNAME= carbon +PORTVERSION= 0.9.9 +CATEGORIES= databases python +MASTER_SITES= http://launchpad.net/graphite/0.9/${PORTVERSION}/+download/ +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= bsdports@wayfair.com +COMMENT= baskend storage application for graphite + +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/txAMQP-0.3-py2.7.egg:${PORTSDIR}/net/py-txamqp \ + ${PYTHON_SITELIBDIR}/whisper.py:${PORTSDIR}/databases/py-whisper + +RUN_DEPENDS= ${BUILD_DEPENDS} +USE_PYTHON= 2.6+ +USE_PYDISTUTILS= yes +USE_TWISTED= yes +FETCH_ARGS= -pRr +USE_RC_SUBR= carbon + + +.include <bsd.port.mk> diff -ruN py-carbon-2/distinfo py-carbon/distinfo --- py-carbon-2/distinfo 1969-12-31 19:00:00.000000000 -0500 +++ py-carbon/distinfo 2011-10-11 13:57:49.000000000 -0400 @@ -0,0 +1,2 @@ +SHA256 (carbon-0.9.9.tar.gz) = b3d42e3b93c09a82646168d7439e25cfc52143d77eba8a1f8ed45e415bb3b5cb +SIZE (carbon-0.9.9.tar.gz) = 39813 diff -ruN py-carbon-2/files/carbon.in py-carbon/files/carbon.in --- py-carbon-2/files/carbon.in 1969-12-31 19:00:00.000000000 -0500 +++ py-carbon/files/carbon.in 2011-10-12 13:51:50.000000000 -0400 @@ -0,0 +1,57 @@ +#!/bin/sh +# +# PROVIDE: carbon +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# carbon_enable (bool): Set to NO by default. +# Set it to YES to enable it. +# carbon_conf_dir: Directory where sabnzbd configuration +# data is stored. +# Default: /usr/local/sabnzbd +# carbon_user: The user account sabnzbd daemon runs as what +# you want it to be. It uses 'www' user by +# default. Do not sets it as empty or it will run +# as root. +# carbon_group: The group account sabnzbd daemon runs as what +# you want it to be. It uses 'www' group by +# default. Do not sets it as empty or it will run +# as wheel. + +. /etc/rc.subr + +name="carbon" +rcvar=${name}_enable + +load_rc_config ${name} + +: ${carbon_enable:="NO"} +: ${carbon_user:="root"} +: ${carbon_group:="wheel"} +: ${carbon_conf:="/usr/local/etc/carbon/carbon.conf"} +: ${carbon_debug:="NO"} +: ${carbon_logdir:="/usr/local/graphite/storage/log"} +: ${carbon_pidfile:="/var/run/carbon.pid"} + +status_cmd="${name}_status" +stop_cmd="${name}_stop" + +command_interpreter="/usr/local/bin/python2.7" +command="/usr/local/bin/carbon-cache.py" +command_args="--config=${carbon_conf} --logdir ${carbon_logdir} --pidfile ${carbon_pidfile} start" + +carbon_stop() { + echo "Stopping $name" + + /usr/local/bin/carbon-cache.py --config=${carbon_conf} --pidfile ${carbon_pidfile} stop +} + +carbon_status() { + /usr/local/bin/carbon-cache.py --config=${carbon_conf} --pidfile ${carbon_pidfile} status + +} + +run_rc_command "$1" + diff -ruN py-carbon-2/files/patch-setup.cfg py-carbon/files/patch-setup.cfg --- py-carbon-2/files/patch-setup.cfg 1969-12-31 19:00:00.000000000 -0500 +++ py-carbon/files/patch-setup.cfg 2011-05-05 21:07:40.000000000 -0400 @@ -0,0 +1,6 @@ +--- setup.cfg.org 2011-05-05 20:55:25.000000000 -0400 ++++ setup.cfg 2011-05-05 20:55:31.000000000 -0400 +@@ -1,3 +1 @@ + [install] +-prefix = /opt/graphite +-install-lib = %(prefix)s/lib diff -ruN py-carbon-2/files/patch-setup.py py-carbon/files/patch-setup.py --- py-carbon-2/files/patch-setup.py 1969-12-31 19:00:00.000000000 -0500 +++ py-carbon/files/patch-setup.py 2011-05-05 22:04:42.000000000 -0400 @@ -0,0 +1,15 @@ +--- setup.py.orig 2011-04-03 22:20:13.000000000 -0400 ++++ setup.py 2011-05-05 22:03:42.000000000 -0400 +@@ -12,9 +12,9 @@ + setup_kwargs = dict() + + +-storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]), +- ('storage/log',[]), ('storage/rrd',[]) ] +-conf_files = [ ('conf', glob('conf/*.example')) ] ++storage_dirs = [ ('/var/db/graphite/storage/whisper',[]), ('/var/db/graphite/storage/lists',[]), ++ ('/var/db/graphite/storage/log',[]), ('/var/db/graphite/storage/rrd',[]) ] ++conf_files = [ ('/usr/local/etc/carbon', glob('conf/*.example')) ] + + setup( + name='carbon', diff -ruN py-carbon-2/files/pkg_message.in py-carbon/files/pkg_message.in --- py-carbon-2/files/pkg_message.in 1969-12-31 19:00:00.000000000 -0500 +++ py-carbon/files/pkg_message.in 2011-05-05 23:54:52.000000000 -0400 @@ -0,0 +1,19 @@ +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +This port now includes an rc script: + +%%PREFIX%%/etc/rc.d/carbon + +Add: + +carbon_enable="YES" + +to /etc/rc.conf, then start it via: + +%%PREFIX%%/etc/rc.d/carbon start + +Once started, finish setting up Graphite + + +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + diff -ruN py-carbon-2/pkg-descr py-carbon/pkg-descr --- py-carbon-2/pkg-descr 1969-12-31 19:00:00.000000000 -0500 +++ py-carbon/pkg-descr 2011-05-05 21:48:26.000000000 -0400 @@ -0,0 +1,3 @@ +Carbon is a backend data caching and persistence daemon for Graphite + +WWW: http://launchpad.net/graphite diff -ruN py-carbon-2/pkg-plist py-carbon/pkg-plist --- py-carbon-2/pkg-plist 1969-12-31 19:00:00.000000000 -0500 +++ py-carbon/pkg-plist 2011-10-11 14:47:13.000000000 -0400 @@ -0,0 +1,103 @@ +bin/carbon-aggregator.py +bin/carbon-cache.py +bin/carbon-client.py +bin/carbon-relay.py +bin/validate-storage-schemas.py +etc/carbon +etc/carbon/rewrite-rules.conf.example +etc/carbon/carbon.amqp.conf.example +etc/carbon/carbon.conf.example +etc/carbon/aggregation-rules.conf.example +etc/carbon/relay-rules.conf.example +etc/carbon/storage-schemas.conf.example +lib/python2.7 +lib/python2.7/site-packages +lib/python2.7/site-packages/twisted +lib/python2.7/site-packages/twisted/plugins +lib/python2.7/site-packages/twisted/plugins/carbon_aggregator_plugin.py +lib/python2.7/site-packages/twisted/plugins/carbon_relay_plugin.py +lib/python2.7/site-packages/twisted/plugins/carbon_cache_plugin.py +lib/python2.7/site-packages/twisted/plugins/carbon_aggregator_plugin.pyc +lib/python2.7/site-packages/twisted/plugins/carbon_relay_plugin.pyc +lib/python2.7/site-packages/twisted/plugins/carbon_cache_plugin.pyc +lib/python2.7/site-packages/twisted/plugins/carbon_aggregator_plugin.pyo +lib/python2.7/site-packages/twisted/plugins/carbon_relay_plugin.pyo +lib/python2.7/site-packages/twisted/plugins/carbon_cache_plugin.pyo +lib/python2.7/site-packages/carbon +lib/python2.7/site-packages/carbon/amqp_publisher.py +lib/python2.7/site-packages/carbon/cache.py +lib/python2.7/site-packages/carbon/client.py +lib/python2.7/site-packages/carbon/util.py +lib/python2.7/site-packages/carbon/relayrules.py +lib/python2.7/site-packages/carbon/hashing.py +lib/python2.7/site-packages/carbon/log.py +lib/python2.7/site-packages/carbon/manhole.py +lib/python2.7/site-packages/carbon/events.py +lib/python2.7/site-packages/carbon/__init__.py +lib/python2.7/site-packages/carbon/routers.py +lib/python2.7/site-packages/carbon/conf.py +lib/python2.7/site-packages/carbon/management.py +lib/python2.7/site-packages/carbon/writer.py +lib/python2.7/site-packages/carbon/amqp_listener.py +lib/python2.7/site-packages/carbon/rewrite.py +lib/python2.7/site-packages/carbon/instrumentation.py +lib/python2.7/site-packages/carbon/storage.py +lib/python2.7/site-packages/carbon/state.py +lib/python2.7/site-packages/carbon/service.py +lib/python2.7/site-packages/carbon/protocols.py +lib/python2.7/site-packages/carbon/aggregator +lib/python2.7/site-packages/carbon/aggregator/rules.py +lib/python2.7/site-packages/carbon/aggregator/__init__.py +lib/python2.7/site-packages/carbon/aggregator/receiver.py +lib/python2.7/site-packages/carbon/aggregator/buffers.py +lib/python2.7/site-packages/carbon/aggregator/rules.pyc +lib/python2.7/site-packages/carbon/aggregator/__init__.pyc +lib/python2.7/site-packages/carbon/aggregator/receiver.pyc +lib/python2.7/site-packages/carbon/aggregator/buffers.pyc +lib/python2.7/site-packages/carbon/aggregator/rules.pyo +lib/python2.7/site-packages/carbon/aggregator/__init__.pyo +lib/python2.7/site-packages/carbon/aggregator/receiver.pyo +lib/python2.7/site-packages/carbon/aggregator/buffers.pyo +lib/python2.7/site-packages/carbon/amqp0-8.xml +lib/python2.7/site-packages/carbon/amqp_publisher.pyc +lib/python2.7/site-packages/carbon/cache.pyc +lib/python2.7/site-packages/carbon/client.pyc +lib/python2.7/site-packages/carbon/util.pyc +lib/python2.7/site-packages/carbon/relayrules.pyc +lib/python2.7/site-packages/carbon/hashing.pyc +lib/python2.7/site-packages/carbon/log.pyc +lib/python2.7/site-packages/carbon/manhole.pyc +lib/python2.7/site-packages/carbon/events.pyc +lib/python2.7/site-packages/carbon/__init__.pyc +lib/python2.7/site-packages/carbon/routers.pyc +lib/python2.7/site-packages/carbon/conf.pyc +lib/python2.7/site-packages/carbon/management.pyc +lib/python2.7/site-packages/carbon/writer.pyc +lib/python2.7/site-packages/carbon/amqp_listener.pyc +lib/python2.7/site-packages/carbon/rewrite.pyc +lib/python2.7/site-packages/carbon/instrumentation.pyc +lib/python2.7/site-packages/carbon/storage.pyc +lib/python2.7/site-packages/carbon/state.pyc +lib/python2.7/site-packages/carbon/service.pyc +lib/python2.7/site-packages/carbon/protocols.pyc +lib/python2.7/site-packages/carbon/amqp_publisher.pyo +lib/python2.7/site-packages/carbon/cache.pyo +lib/python2.7/site-packages/carbon/client.pyo +lib/python2.7/site-packages/carbon/util.pyo +lib/python2.7/site-packages/carbon/relayrules.pyo +lib/python2.7/site-packages/carbon/hashing.pyo +lib/python2.7/site-packages/carbon/log.pyo +lib/python2.7/site-packages/carbon/manhole.pyo +lib/python2.7/site-packages/carbon/events.pyo +lib/python2.7/site-packages/carbon/__init__.pyo +lib/python2.7/site-packages/carbon/routers.pyo +lib/python2.7/site-packages/carbon/conf.pyo +lib/python2.7/site-packages/carbon/management.pyo +lib/python2.7/site-packages/carbon/writer.pyo +lib/python2.7/site-packages/carbon/amqp_listener.pyo +lib/python2.7/site-packages/carbon/rewrite.pyo +lib/python2.7/site-packages/carbon/instrumentation.pyo +lib/python2.7/site-packages/carbon/storage.pyo +lib/python2.7/site-packages/carbon/state.pyo +lib/python2.7/site-packages/carbon/service.pyo +lib/python2.7/site-packages/carbon/protocols.pyo >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110121814.p9CIEpPe011885>