Date: Fri, 25 Sep 2015 12:55:11 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397821 - in head: . sysutils sysutils/riak-cs sysutils/riak-cs/files Message-ID: <201509251255.t8PCtB8R034566@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Fri Sep 25 12:55:10 2015 New Revision: 397821 URL: https://svnweb.freebsd.org/changeset/ports/397821 Log: sysutils/riak-cs: Open source, distributed, S3 interface to Riak KV Riak CS is an object storage system built on top of Riak. It facilitates storing large objects in Riak and presents an S3-compatible interface. It also provides multi-tenancy features such as user accounts, authentication, access control mechanisms, and per account usage reporting. WWW: https://github.com/basho/riak_cs Submitted by: Scott Kamp (based on) Added: head/sysutils/riak-cs/ head/sysutils/riak-cs/Makefile (contents, props changed) head/sysutils/riak-cs/distinfo (contents, props changed) head/sysutils/riak-cs/files/ head/sysutils/riak-cs/files/patch-rel_vars.config (contents, props changed) head/sysutils/riak-cs/files/riak-cs.in (contents, props changed) head/sysutils/riak-cs/pkg-descr (contents, props changed) head/sysutils/riak-cs/pkg-plist (contents, props changed) Modified: head/UIDs head/sysutils/Makefile Modified: head/UIDs ============================================================================== --- head/UIDs Fri Sep 25 12:46:35 2015 (r397820) +++ head/UIDs Fri Sep 25 12:55:10 2015 (r397821) @@ -223,6 +223,7 @@ caldavd:*:639:639::0:0:Caldavd user:/var monkeysphere:*:641:641::0:0:Monkeysphere User:/var/monkeysphere:/usr/local/bin/bash aox:*:666:666::0:0:Archiveopteryx user:/nonexistent:/usr/sbin/nologin riak:*:667:667::0:0:Riak user:/usr/local/lib/riak:/bin/sh +riakcs:*:668:667::0:0:Riak CS user:/usr/local/lib/riak-cs:/bin/sh stanchion:*:669:667::0:0:Stanchion user:/usr/local/lib/stanchion:/bin/sh bnetd:*:700:700::0:0:Bnetd user:/nonexistent:/usr/sbin/nologin fastnetmon:*:701:701::0:0:FastNetMon user:/nonexistent:/usr/sbin/nologin Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Fri Sep 25 12:46:35 2015 (r397820) +++ head/sysutils/Makefile Fri Sep 25 12:55:10 2015 (r397821) @@ -828,6 +828,7 @@ SUBDIR += retail SUBDIR += rfstool SUBDIR += rhc + SUBDIR += riak-cs SUBDIR += rinse SUBDIR += rmonitor SUBDIR += roottail Added: head/sysutils/riak-cs/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/riak-cs/Makefile Fri Sep 25 12:55:10 2015 (r397821) @@ -0,0 +1,80 @@ +# $FreeBSD$ + +PORTNAME= riak-cs +PORTVERSION= 2.0.1 +CATEGORIES= sysutils +MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/ \ + http://downloads.basho.com.s3.amazonaws.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/ + +MAINTAINER= wg@FreeBSD.org +COMMENT= Open source, distributed, S3 interface to Riak KV + +LICENSE= APACHE20 + +BUILD_DEPENDS= ${LOCALBASE}/lib/riak-erlang/bin/erlc:${PORTSDIR}/lang/erlang-riak + +USES= gmake readline +USE_RC_SUBR= riak-cs +USE_GCC= yes + +USERS= riakcs +GROUPS= riak + +RIAKCS_CONFDIR?=${PREFIX}/etc/riak-cs +RIAKCS_DBDIR?= /var/db/riak-cs +RIAKCS_HOMEDIR?=${PREFIX}/lib/riak-cs +RIAKCS_LIBDIR?= ${PREFIX}/lib/riak-cs/lib +RIAKCS_LOGDIR?= /var/log/riak-cs + +PLIST_SUB+= RIAKCS_CONFDIR=${RIAKCS_CONFDIR} \ + RIAKCS_DBDIR=${RIAKCS_DBDIR} \ + RIAKCS_HOMEDIR=${RIAKCS_HOMEDIR} \ + RIAKCS_LIBDIR=${RIAKCS_LIBDIR} \ + RIAKCS_LOGDIR=${RIAKCS_LOGDIR} \ + USERS=${USERS} \ + GROUPS=${GROUPS} + +ALL_TARGET= rel +MAKE_JOBS_UNSAFE=yes +MAKE_ENV= PATH=${LOCALBASE}/lib/riak-erlang/bin:${PATH} + +post-patch: + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config + +do-install: + ${MKDIR} ${STAGEDIR}${RIAKCS_CONFDIR} + ${MKDIR} ${STAGEDIR}${RIAKCS_DBDIR} + ${MKDIR} ${STAGEDIR}${RIAKCS_LOGDIR} + ${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/riak-cs.conf ${STAGEDIR}${RIAKCS_CONFDIR}/riak-cs.conf + ${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/advanced.config ${STAGEDIR}${RIAKCS_CONFDIR}/advanced.config + ${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/cert.pem ${STAGEDIR}${RIAKCS_CONFDIR}/cert.pem + ${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/key.pem ${STAGEDIR}${RIAKCS_CONFDIR}/key.pem + (cd ${WRKSRC}/rel/riak-cs/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAKCS_LIBDIR}) + (cd ${WRKSRC}/rel/riak-cs/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/) + (cd ${WRKSRC}/rel/riak-cs/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAKCS_LIBDIR}/basho-patches) + (cd ${WRKSRC}/rel/riak-cs/releases && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAKCS_HOMEDIR}/releases) + ${CP} -R ${WRKSRC}/rel/riak-cs/erts-* ${STAGEDIR}${RIAKCS_HOMEDIR} + +post-install: + (cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} releases -type f \ + | ${SED} -e 's,^\./,,g' \ + | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ + | ${AWK} '{print "lib/riak-cs/"$$2 }' >> ${TMPPLIST}) + (cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} erts-* -type f \ + | ${SED} -e 's,^\./,,g' \ + | ${AWK} '{print length, $$0}' | ${SORT} -rn \ + | ${AWK} '{print "lib/riak-cs/"$$2 }' >> ${TMPPLIST}) + (cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} erts-* -type d -empty \ + | ${SED} -e 's,^\./,,g' \ + | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ + | ${AWK} '{print "@dir lib/riak-cs/"$$2 }' >> ${TMPPLIST}) + (cd ${STAGEDIR}${RIAKCS_LIBDIR}; ${FIND} . -type f \ + | ${SED} -e 's,^\./,,g' \ + | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ + | ${AWK} '{print "lib/riak-cs/lib/"$$2 }' >> ${TMPPLIST}) + (cd ${STAGEDIR}${RIAKCS_LIBDIR}; ${FIND} . -type d -empty \ + | ${SED} -e 's,^\./,,g' \ + | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ + | ${AWK} '{print "@dir lib/riak-cs/lib/"$$2 }' >> ${TMPPLIST}) + +.include <bsd.port.mk> Added: head/sysutils/riak-cs/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/riak-cs/distinfo Fri Sep 25 12:55:10 2015 (r397821) @@ -0,0 +1,2 @@ +SHA256 (riak-cs-2.0.1.tar.gz) = 7c8d38ff678c42271e51270bb9e82002358f8c2d15a071ae8e406d52655c64da +SIZE (riak-cs-2.0.1.tar.gz) = 9734438 Added: head/sysutils/riak-cs/files/patch-rel_vars.config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/riak-cs/files/patch-rel_vars.config Fri Sep 25 12:55:10 2015 (r397821) @@ -0,0 +1,47 @@ +--- rel/vars.config.orig 2015-05-29 10:29:55.000000000 +1000 ++++ rel/vars.config 2015-09-24 14:36:24.429038742 +1000 +@@ -2,11 +2,12 @@ + %% ex: ts=4 sw=4 et + + %% Platform-specific installation paths +-{platform_bin_dir, "./bin"}. +-{platform_data_dir, "./data"}. +-{platform_etc_dir, "./etc"}. +-{platform_lib_dir, "./lib"}. +-{platform_log_dir, "./log"}. ++{platform_base_dir, "%%PREFIX%%/lib/riak-cs"}. ++{platform_bin_dir, "%%PREFIX%%/sbin"}. ++{platform_etc_dir, "%%PREFIX%%/etc/riak-cs"}. ++{platform_lib_dir, "%%PREFIX%%/lib/riak-cs/lib"}. ++{platform_data_dir, "/var/db/riak-cs"}. ++{platform_log_dir, "/var/log/riak-cs"}. + + %% lager + {console_log_default, file}. +@@ -41,16 +42,18 @@ + %% bin/riak_cs + %% + {data_dir, "{{target_dir}}/data"}. +-{runner_script_dir, "\`cd \\`dirname $0\\` && /bin/pwd\`"}. +-{runner_base_dir, "{{runner_script_dir}}/.."}. +-{runner_etc_dir, "$RUNNER_BASE_DIR/etc"}. +-{runner_log_dir, "$RUNNER_BASE_DIR/log"}. +-{runner_lib_dir, "$RUNNER_BASE_DIR/lib"}. +-{runner_patch_dir, "$RUNNER_BASE_DIR/lib/basho-patches"}. +-{pipe_dir, "/tmp/$RUNNER_BASE_DIR/"}. +-{runner_user, ""}. ++{runner_script_dir, "{{platform_bin_dir}}"}. ++{runner_base_dir, "{{platform_base_dir}}"}. ++{runner_etc_dir, "{{platform_etc_dir}}"}. ++{runner_log_dir, "{{platform_log_dir}}"}. ++{runner_lib_dir, "{{platform_lib_dir}}"}. ++{runner_patch_dir, "{{platform_lib_dir}}/basho-patches"}. ++{pipe_dir, "/tmp/riak-cs"}. ++{runner_user, "riakcs"}. + {runner_wait_process, "riak_cs_put_fsm_sup"}. + ++ ++ + %% + %% cuttlefish + %% Added: head/sysutils/riak-cs/files/riak-cs.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/riak-cs/files/riak-cs.in Fri Sep 25 12:55:10 2015 (r397821) @@ -0,0 +1,84 @@ +#!/bin/sh +# $FreeBSD$ + +# PROVIDE: riak-cs +# REQUIRE: LOGIN cleanvar +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable riak-cs: +# riak-cs_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable riak-cs on boot. +# + +. /etc/rc.subr + +name="riak-cs" +rcvar=riak_cs_enable + +pidfile=/var/run/riak-cs/riak-cs.pid + +start_cmd="riak-cs_start" +stop_cmd="riak-cs_stop" +restart_cdm="riak-cs_restart" +status_cmd="riak-cs_status" +command="%%PREFIX%%/sbin/riak-cs" + +load_rc_config $name + +# Read rc.d config and set defaults +load_rc_config "$name" +: ${riak-cs_enable="NO"} + +riak-cs_start() +{ + echo "Starting Riak." + %%PREFIX%%/sbin/riak-cs start + return 0 +} + +riak-cs_stop() +{ + echo "Stopping Riak processes" + %%PREFIX%%/sbin/riak-cs stop + killall -9 epmd + return 0 +} + +riak-cs_restart() +{ + riak-cs_stop + riak-cs_start + return 0 +} + +riak-cs_status() +{ + if riak-cs_running; then + echo "Riak is running." + return 0 + else + echo "Riak is not running" + return 1 + fi +} + +riak-cs_running() +{ + local pid result ps + pid=`%%PREFIX%%/sbin/riak-cs getpid` + result=`echo $?` + if [ "$result" == 0 ]; then + ps=`ps -waux | grep ${pid} | grep riak-cs` + result=`echo $?` + if [ "$result" ]; then + return 0 + else + return 1 + fi + else + return 1 + fi +} + +run_rc_command "$1" Added: head/sysutils/riak-cs/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/riak-cs/pkg-descr Fri Sep 25 12:55:10 2015 (r397821) @@ -0,0 +1,6 @@ +Riak CS is an object storage system built on top of Riak. It facilitates +storing large objects in Riak and presents an S3-compatible interface. It also +provides multi-tenancy features such as user accounts, authentication, access +control mechanisms, and per account usage reporting. + +WWW: https://github.com/basho/riak_cs Added: head/sysutils/riak-cs/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/riak-cs/pkg-plist Fri Sep 25 12:55:10 2015 (r397821) @@ -0,0 +1,19 @@ +sbin/riak-cs +sbin/riak-cs-access +sbin/riak-cs-admin +sbin/riak-cs-debug +sbin/riak-cs-gc +sbin/riak-cs-multibag +sbin/riak-cs-stanchion +sbin/riak-cs-storage +@sample %%RIAKCS_CONFDIR%%/riak-cs.conf +@sample %%RIAKCS_CONFDIR%%/advanced.config +@sample %%RIAKCS_CONFDIR%%/key.pem +@sample %%RIAKCS_CONFDIR%%/cert.pem +@dir %%RIAKCS_CONFDIR%% +@owner %%USERS%% +@group %%GROUPS%% +@dir %%RIAKCS_DBDIR%% +@dir %%RIAKCS_HOMEDIR%% +@dir %%RIAKCS_LIBDIR%% +@dir %%RIAKCS_LOGDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509251255.t8PCtB8R034566>