Attachment 154202 Details for Bug 198517 – fixed riak conf dir $prefix/etc/riak

fixed riak conf dir $prefix/etc/riak

riak2.shar (text/plain), 13.92 KB, created by nbari on 2015-03-11 14:21:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nbari

Created: 2015-03-11 14:21:50 UTC

Size: 13.92 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	riak2
>#	riak2/pkg-plist
>#	riak2/Makefile
>#	riak2/distinfo
>#	riak2/files
>#	riak2/files/riak.in
>#	riak2/files/patch-deps_yokozuna_tools_grab-solr.sh
>#	riak2/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch
>#	riak2/files/patch-rel_vars.config
>#	riak2/pkg-descr
>#
>echo c - riak2
>mkdir -p riak2 > /dev/null 2>&1
>echo x - riak2/pkg-plist
>sed 's/^X//' >riak2/pkg-plist << '7c5bf3774bfe55fa5eee0289fdadde64'
>Xsbin/riak
>Xsbin/riak-admin
>Xsbin/riak-debug
>Xsbin/search-cmd
>Xman/man1/riak-admin.1.gz
>Xman/man1/riak-debug.1.gz
>Xman/man1/riak.1.gz
>Xman/man1/search-cmd.1.gz
>X%%RIAK_CONFDIR%%/riak.conf
>X%%RIAK_CONFDIR%%/riak.conf.sample
>X%%RIAK_CONFDIR%%/solr-log4j.properties
>X%%RIAK_CONFDIR%%/solr-log4j.properties.sample
>X@owner %%USERS%%
>X@group %%GROUPS%%
>X@dir %%RIAK_DBDIR%%
>X@dir %%RIAK_HOMEDIR%%
>X@dir %%RIAK_LIBDIR%%
>X@dir %%RIAK_LOGDIR%%
>7c5bf3774bfe55fa5eee0289fdadde64
>echo x - riak2/Makefile
>sed 's/^X//' >riak2/Makefile << 'a435dc9f5652fe32285ce47dbd21068a'
>X# $FreeBSD$
>X
>XPORTNAME=	riak2
>XPORTVERSION=	2.0.5
>XCATEGORIES=	databases
>XMASTER_SITES=	http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
>X	http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
>X	http://s3.amazonaws.com/files.basho.com/solr/:solr \
>X	http://s3.amazonaws.com/files.basho.com/yokozuna/:yokozuna
>XDISTNAME=	riak-${PORTVERSION}
>XDISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>X	solr-4.7.0-yz-1.tgz:solr \
>X	yokozuna-1.jar:yokozuna \
>X	yz_monitor-1.jar:yokozuna
>XEXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} solr-4.7.0-yz-1.tgz
>X
>XMAINTAINER=	nbari@dalmp.com
>XCOMMENT=	Riak is an open source, distributed, noSQL database
>X
>XLICENSE=	APACHE20
>X
>XBUILD_DEPENDS=	${LOCALBASE}/lib/erlang16/bin/erlc:${PORTSDIR}/lang/erlang-runtime16
>X
>XUSES=		gmake readline
>XUSE_RC_SUBR=	riak
>XUSE_GCC=	yes
>X
>XUSERS=		riak
>XGROUPS=		riak
>X
>XRIAK_CONFDIR?=	${PREFIX}/etc/riak
>XRIAK_DBDIR?=	/var/db/riak
>XRIAK_HOMEDIR?=	${PREFIX}/lib/riak
>XRIAK_LIBDIR?=	${PREFIX}/lib/riak/lib
>XRIAK_LOGDIR?=	/var/log/riak
>X
>XPLIST=		${WRKDIR}/pkg-plist
>XPLIST_SUB+= RIAK_CONFDIR=${RIAK_CONFDIR} \
>X	RIAK_DBDIR=${RIAK_DBDIR} \
>X	RIAK_HOMEDIR=${RIAK_HOMEDIR} \
>X	RIAK_LIBDIR=${RIAK_LIBDIR} \
>X	RIAK_LOGDIR=${RIAK_LOGDIR} \
>X	USERS=${USERS} \
>X	GROUPS=${GROUPS}
>X
>XALL_TARGET=	rel
>XMAKE_JOBS_UNSAFE=yes
>XMAKE_ENV=	PATH=${LOCALBASE}/lib/erlang16/bin:${PATH}
>X
>X.include <bsd.port.pre.mk>
>X
>Xpost-patch:
>X	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config
>X	@${REINPLACE_CMD} -e 's|%%BUILD_DIR%%|${WRKDIR}|g' \
>X		-e 's|%%DISTDIR%%|${DISTDIR}|g' \
>X		-e 's|%%YOKOZUNA%%|${WRKSRC}/deps/yokozuna|g' \
>X		${WRKSRC}/deps/yokozuna/tools/grab-solr.sh
>X
>Xpre-install:
>X	${RM} -f ${PLIST}
>X	${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
>X	(cd ${WRKSRC}/rel/riak; ${FIND} releases -type f \
>X		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
>X		| ${AWK} '{print "lib/riak/"$$2 }' >> ${PLIST})
>X	(cd ${WRKSRC}/rel/riak; ${FIND} erts-* -type f \
>X		| ${AWK} '{print length, $$0}' | ${SORT} -rn  \
>X		| ${AWK} '{print "lib/riak/"$$2 }' >> ${PLIST})
>X	(cd ${WRKSRC}/rel; ${FIND} riak/lib -type f \
>X		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
>X		| ${AWK} '{print "lib/"$$2 }' >> ${PLIST})
>X	(cd ${WRKSRC}/rel; ${FIND} riak/lib -type d -empty \
>X		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
>X		| ${AWK} '{print "@dir lib/"$$2 }' >> ${PLIST})
>X	${ECHO} "@owner" >> ${PLIST}
>X	${ECHO} "@group" >> ${PLIST}
>X
>Xdo-install:
>X.for d in ${RIAK_CONFDIR} ${RIAK_LOGDIR} ${RIAK_DBDIR} ${RIAK_LIBDIR} ${RIAK_HOMEDIR}
>X	${MKDIR} ${STAGEDIR}${d}
>X.endfor
>X	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${RIAK_CONFDIR}/riak.conf.sample
>X	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${RIAK_CONFDIR}/riak.conf
>X	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${RIAK_CONFDIR}/solr-log4j.properties.sample
>X	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${RIAK_CONFDIR}/solr-log4j.properties
>X	(cd ${WRKSRC}/rel/riak/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAK_LIBDIR})
>X	(cd ${WRKSRC}/rel/riak/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/)
>X	(cd ${WRKSRC}/rel/riak/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_LIBDIR}/basho-patches)
>X	(cd ${WRKSRC}/rel/riak/releases && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_HOMEDIR}/releases)
>X	${CP} -R ${WRKSRC}/rel/riak/erts-* ${STAGEDIR}${RIAK_HOMEDIR}
>X	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
>X	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-admin.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
>X	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-debug.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
>X	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/search-cmd.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
>X	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/bitcask-1.7.0/priv/bitcask.so
>X	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/erlang_js-1.3.0-0-g07467d8/priv/erlang_js_drv.so
>X	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/syslog-1.0.2/priv/syslog_drv.so
>X	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/canola-2.0.0-0-g9bdfee8/priv/canola-port
>X	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/riak_ensemble-2.0.0-1-gd66a102/priv/riak_ensemble.so
>X	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/sext-1.1p3-0-g846b9cc/priv/sext.so
>X	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/eleveldb-2.0.0-3-g10fcb78/priv/eleveldb.so
>X
>X.include <bsd.port.post.mk>
>a435dc9f5652fe32285ce47dbd21068a
>echo x - riak2/distinfo
>sed 's/^X//' >riak2/distinfo << '16f653306ef2809ac709cf629b793e8c'
>XSHA256 (riak-2.0.5.tar.gz) = 390cd596762a7465712b472eb7058314a400068fa1ad567b93530eecdaed8047
>XSIZE (riak-2.0.5.tar.gz) = 17805547
>XSHA256 (solr-4.7.0-yz-1.tgz) = 172380c6c334797b4639f7c497a2a34a249efbfd3917106b3662f6b1e8a0352f
>XSIZE (solr-4.7.0-yz-1.tgz) = 166999678
>XSHA256 (yokozuna-1.jar) = 91a208e1fde1ef2a931f8d14ba150f730c92bc3a7a8e8bce30c6a6b027e18f82
>XSIZE (yokozuna-1.jar) = 10645
>XSHA256 (yz_monitor-1.jar) = 35c41c103c83452c6377fac42b6c8bb714d2e1e2b8c02053397c0fa2423b694d
>XSIZE (yz_monitor-1.jar) = 2661
>16f653306ef2809ac709cf629b793e8c
>echo c - riak2/files
>mkdir -p riak2/files > /dev/null 2>&1
>echo x - riak2/files/riak.in
>sed 's/^X//' >riak2/files/riak.in << 'e2d5e5addb254ddada95f3988a92990a'
>X#!/bin/sh                                                                                                               
>X
>X# $FreeBSD$
>X#
>X# PROVIDE: riak
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X#
>X# Add these lines to /etc/rc.conf.local or /etc/rc.conf
>X# to enable this service:
>X#
>X# riak_enable (bool):   Set to NO by default.
>X#                       Set it to YES to enable riak
>X
>X. /etc/rc.subr
>X
>Xname=riak
>Xrcvar=riak_enable
>X
>Xload_rc_config $name
>X
>Xcommand=%%PREFIX%%/lib/riak/erts-5.10.4/bin/beam.smp
>Xpidfile="/var/run/${name}/${name}.pid"
>Xstart_cmd="%%PREFIX%%/sbin/${name} start"
>Xstop_cmd="%%PREFIX%%/sbin/${name} stop"
>X
>Xrun_rc_command "$1"
>e2d5e5addb254ddada95f3988a92990a
>echo x - riak2/files/patch-deps_yokozuna_tools_grab-solr.sh
>sed 's/^X//' >riak2/files/patch-deps_yokozuna_tools_grab-solr.sh << 'ce493af5e921122ba09645a8fd11e18b'
>X--- deps/yokozuna/tools/grab-solr.sh.orig	2015-01-27 15:59:10 UTC
>X+++ deps/yokozuna/tools/grab-solr.sh
>X@@ -1,4 +1,4 @@
>X-#!/usr/bin/env bash
>X+#!/usr/bin/env sh
>X #
>X # Script to grab Solr and embed in priv dir. This script assumes it is
>X # being called from root dir or tools dir.
>X@@ -14,10 +14,10 @@ then
>X     cd tools
>X fi
>X 
>X-PRIV_DIR=../priv
>X+PRIV_DIR=%%YOKOZUNA%%/priv
>X CONF_DIR=$PRIV_DIR/conf
>X SOLR_DIR=$PRIV_DIR/solr
>X-BUILD_DIR=../build
>X+BUILD_DIR=%%BUILD_DIR%%
>X VSN=solr-4.7.0-yz-1
>X FILENAME=$VSN.tgz
>X TMP_DIR=/var/tmp/yokozuna
>X@@ -32,56 +32,11 @@ check_for_solr()
>X     test -e $SOLR_DIR/start.jar
>X }
>X 
>X-download()
>X-{
>X-    if which wget > /dev/null; then
>X-        wget --no-check-certificate --progress=dot:mega $1
>X-    elif which curl > /dev/null; then
>X-        curl --insecure --progress-bar -O $1
>X-    fi
>X-}
>X-
>X-get_solr()
>X-{
>X-        if [[ -z ${SOLR_PKG_DIR+x} ]]
>X-        then
>X-            if [ -e $TMP_FILE ]; then
>X-                echo "Using cached copy of Solr $TMP_FILE"
>X-                ln -s $TMP_FILE $FILENAME
>X-            else
>X-                echo "Pulling Solr from S3"
>X-                download "http://s3.amazonaws.com/files.basho.com/solr/$FILENAME"
>X-                if [ -d $TMP_DIR ]; then
>X-                    cp $FILENAME $TMP_DIR
>X-                else
>X-                    mkdir $TMP_DIR
>X-                    cp $FILENAME $TMP_DIR
>X-                fi
>X-            fi
>X-        else
>X-            # This is now obsolete thanks to implicit caching above
>X-            # but will leave in for now as to not break anyone.
>X-            echo "Using local copy of Solr $SOLR_PKG_DIR/$FILENAME"
>X-            cp $SOLR_PKG_DIR/$FILENAME ./
>X-        fi
>X-        tar zxf $FILENAME
>X-}
>X-
>X if ! check_for_solr
>X then
>X 
>X-    echo "Create dir $BUILD_DIR"
>X-    if [ ! -e $BUILD_DIR ]; then
>X-        mkdir $BUILD_DIR
>X-    fi
>X-
>X     cd $BUILD_DIR
>X 
>X-    if [ ! -e $SRC_DIR ]
>X-    then
>X-        get_solr
>X-    fi
>X-
>X     echo "Creating Solr dir $SOLR_DIR"
>X 
>X     # Explicitly copy files needed rather than copying everything and
>X@@ -106,7 +61,7 @@ then
>X     echo "Solr dir created successfully"
>X fi
>X 
>X-JAVA_LIB=../priv/java_lib
>X+JAVA_LIB=%%YOKOZUNA%%/priv/java_lib
>X YZ_JAR_VSN=1
>X YZ_JAR_NAME=yokozuna-$YZ_JAR_VSN.jar
>X 
>X@@ -117,18 +72,16 @@ then
>X         mkdir $JAVA_LIB
>X     fi
>X 
>X-    echo "Downloading $YZ_JAR_NAME"
>X-    download "http://s3.amazonaws.com/files.basho.com/yokozuna/$YZ_JAR_NAME"
>X-    mv $YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME
>X+    echo "Copying $YZ_JAR_NAME"
>X+    cp %%DISTDIR%%/$YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME
>X fi
>X 
>X-EXT_LIB=../priv/solr/lib/ext
>X+EXT_LIB=%%YOKOZUNA%%/priv/solr/lib/ext
>X MON_JAR_VSN=1
>X MON_JAR_NAME=yz_monitor-$MON_JAR_VSN.jar
>X 
>X if [ ! -e $EXT_LIB/$MON_JAR_NAME ]
>X then
>X-    echo "Downloading $MON_JAR_NAME"
>X-    download "http://s3.amazonaws.com/files.basho.com/yokozuna/$MON_JAR_NAME"
>X-    mv $MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME
>X+    echo "Copying $MON_JAR_NAME"
>X+    cp %%DISTDIR%%/$MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME
>X fi
>ce493af5e921122ba09645a8fd11e18b
>echo x - riak2/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch
>sed 's/^X//' >riak2/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch << '82e355b86d5f6fb75e11ff3588d41fa4'
>X--- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig    2015-02-26 16:11:58 UTC
>X+++ deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch
>X@@ -1,6 +1,6 @@
>X --- c_src.orig/js/src/config/FreeBSD.mk        1969-12-31 19:00:00.000000000 -0500
>X +++ c_src/js/src/config/FreeBSD.mk     2011-03-30 20:12:51.000000000 -0400
>X-@@ -0,0 +1,99 @@
>X+@@ -0,0 +1,100 @@
>X +# -*- Mode: makefile -*-
>X +#
>X +# ***** BEGIN LICENSE BLOCK *****
>X@@ -46,6 +46,7 @@
>X +
>X +CC ?= gcc
>X +CCC ?= g++
>X++LD = $(CC)
>X +CFLAGS +=  -Wall -Wno-format
>X +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
>X +
>X@@ -63,7 +64,7 @@
>X +OS_CFLAGS+= -DX86_LINUX
>X +
>X +ifeq (gcc, $(CC))
>X-+# if using gcc on x86, check version for opt bug 
>X++# if using gcc on x86, check version for opt bug
>X +# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
>X +GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
>X +GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
>82e355b86d5f6fb75e11ff3588d41fa4
>echo x - riak2/files/patch-rel_vars.config
>sed 's/^X//' >riak2/files/patch-rel_vars.config << '0b3d21a6080981d15d9daaf8aae1621e'
>X--- rel/vars.config.orig        2015-02-27 13:37:42 UTC
>X+++ rel/vars.config
>X@@ -2,11 +2,12 @@
>X %% ex: ft=erlang ts=4 sw=4 et
>X 
>X %% Platform-specific installation paths
>X-{platform_bin_dir,  "./bin"}.
>X-{platform_data_dir, "./data"}.
>X-{platform_etc_dir,  "./etc"}.
>X-{platform_lib_dir,  "./lib"}.
>X-{platform_log_dir,  "./log"}.
>X+{platform_base_dir, "%%PREFIX%%/lib/riak"}.
>X+{platform_bin_dir,  "%%PREFIX%%/sbin"}.
>X+{platform_etc_dir,  "%%PREFIX%%/etc/riak"}.
>X+{platform_lib_dir,  "%%PREFIX%%/lib/riak/lib"}.
>X+{platform_data_dir, "/var/db/riak"}.
>X+{platform_log_dir,  "/var/log/riak"}.
>X 
>X %%
>X %% etc/app.config
>X@@ -40,14 +41,14 @@
>X %%
>X %% bin/riak
>X %%
>X-{runner_script_dir,  "\`cd \\`dirname $0\\` && /bin/pwd\`"}.
>X-{runner_base_dir,    "{{runner_script_dir}}/.."}.
>X-{runner_etc_dir,     "$RUNNER_BASE_DIR/etc"}.
>X-{runner_log_dir,     "$RUNNER_BASE_DIR/log"}.
>X-{runner_lib_dir,     "$RUNNER_BASE_DIR/lib"}.
>X-{runner_patch_dir,   "$RUNNER_BASE_DIR/lib/basho-patches"}.
>X-{pipe_dir,           "/tmp/$RUNNER_BASE_DIR/"}.
>X-{runner_user,        ""}.
>X+{runner_script_dir,  "{{platform_bin_dir}}"}.
>X+{runner_base_dir,    "{{platform_base_dir}}"}.
>X+{runner_etc_dir,     "{{platform_etc_dir}}"}.
>X+{runner_log_dir,     "{{platform_log_dir}}"}.
>X+{runner_lib_dir,     "{{platform_lib_dir}}"}.
>X+{runner_patch_dir,   "{{platform_lib_dir}}/basho-patches"}.
>X+{pipe_dir,           "/tmp/riak"}.
>X+{runner_user,        "riak"}.
>X {runner_wait_process, "riak_core_node_watcher"}.
>X {runner_ulimit_warn, 65536}.
>0b3d21a6080981d15d9daaf8aae1621e
>echo x - riak2/pkg-descr
>sed 's/^X//' >riak2/pkg-descr << '6daf46d29498b8189141a5155954abda'
>XRiak is an open source, distributed database. Riak is architected for:
>X
>X* Low-Latency
>XRiak is designed to store data and serve requests predictably and quickly, even
>Xduring peak times.
>X
>X* Availability
>XRiak replicates and retrieves data intelligently, making it available for read
>Xand write operations even in failure conditions.
>X
>X* Fault-Tolerance
>XRiak is fault-tolerant so you can lose access to nodes due to network partition
>Xor hardware failure and never lose data.
>X
>X* Operational Simplicity
>XRiak allows you to add machines to the cluster easily, without a large
>Xoperational burden.
>X
>XWWW: http://basho.com/riak
>6daf46d29498b8189141a5155954abda
>exit
>

Actions: View

Attachments on bug 198517: 154199 | 154202 | 154204 | 154212 | 154451 | 154455