Date: Fri, 14 Jun 2013 15:26:34 +0400 (MSK) From: Anes Mukhametov <anes@anes.su> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/179551: [patch] databases/redis: add profiles to redis.in Message-ID: <201306141126.r5EBQYZj099740@monitoring.rambler.ru> Resent-Message-ID: <201306141130.r5EBU1tr066247@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179551
>Category: ports
>Synopsis: [patch] databases/redis: add profiles to redis.in
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 14 11:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Anes Mukhametov
>Release: FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
>Description:
Modified redis.in to run multiple redis instances (profiles).
For example set redis_profiles="foo bar", create /usr/local/etc/redis-foo.conf and /usr/local/etc/redis-bar.conf and start redis.
>How-To-Repeat:
>Fix:
--- redis.patch begins here ---
diff -ruN databases/redis.orig/Makefile databases/redis/Makefile
--- databases/redis.orig/Makefile 2013-06-13 20:24:06.265964000 +0400
+++ databases/redis/Makefile 2013-06-14 15:15:55.239479169 +0400
@@ -3,6 +3,7 @@
PORTNAME= redis
DISTVERSION= 2.6.13
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
diff -ruN databases/redis.orig/files/redis.in databases/redis/files/redis.in
--- databases/redis.orig/files/redis.in 2013-06-13 20:24:06.256964000 +0400
+++ databases/redis/files/redis.in 2013-06-14 15:15:19.535562420 +0400
@@ -8,10 +8,15 @@
# BEFORE: securelevel
# KEYWORD: shutdown
-# Add the following line to /etc/rc.conf to enable `redis':
-#
-#redis_enable="YES"
+# Add the following lines to /etc/rc.conf to run redis:
#
+# redis_enable (bool): Set it to "YES" to enable redis.
+# Default is "NO".
+# redis_profiles (strings): Set it to "foo bar", for example,
+# to run two separate redis instances.
+# They will use %%PREFIX%%/etc/redis-foo.conf and
+# %%PREFIX%%/etc/redis-bar.conf respectively.
+# Default is empty.
. /etc/rc.subr
@@ -31,4 +36,34 @@
: ${redis_enable="NO"}
: ${redis_user="%%REDIS_USER%%"}
+_profile_exists() {
+ for _p in ${redis_profiles}; do
+ [ "${_p}" = "$1" ] && return 1;
+ done
+ return 0
+}
+
+if [ $# -eq 2 ]; then
+ _profile=$2
+ _profile_exists $_profile
+ _exists=$?
+ [ ${_exists} -ne 1 ] && {
+ echo "`basename %%PREFIX%%/etc/rc.d/redis`: no '$2' in 'redis_profiles'"
+ exit 1
+ };
+ echo "-- Profile: ${_profile} --"
+ config_file="%%PREFIX%%/etc/${name}-${_profile}.conf"
+ command_args="${config_file}"
+ pidfile="%%REDIS_RUNDIR%%/${_profile}.pid"
+ required_files="${config_file}"
+elif [ -n "${redis_profiles}" ]; then
+ _swap=$*; shift; _profiles=$*
+ _profiles=${_profiles:-${redis_profiles}}
+ set -- ${_swap}
+ for _profile in ${_profiles}; do
+ %%PREFIX%%/etc/rc.d/redis $1 ${_profile}
+ done
+ exit 0
+fi
+
run_rc_command "$1"
--- redis.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306141126.r5EBQYZj099740>