diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2015-05-06 01:24:13 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2015-05-06 01:24:13 +0000 |
| commit | ef7625e1f6c423d5cd91a4d62ddb4ca4b12e7fdb (patch) | |
| tree | 853df7d5bed69217e7d7255d4f03a1dd7684490f /databases | |
| parent | Upgrade from 3.0.0 to 3.0.1. (diff) | |
Fix rc.d script for allow to specify the config path in rc.conf.
Bump PORTREVISION.
PR: 199607
Notes
Notes:
svn path=/head/; revision=385499
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/redis-devel/Makefile | 1 | ||||
| -rw-r--r-- | databases/redis-devel/files/redis.in | 6 | ||||
| -rw-r--r-- | databases/redis/Makefile | 1 | ||||
| -rw-r--r-- | databases/redis/files/redis.in | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 0a9889afc360..e1be3abf5097 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= redis DISTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ PKGNAMESUFFIX= -devel diff --git a/databases/redis-devel/files/redis.in b/databases/redis-devel/files/redis.in index 386639f2c890..ec47419e58c1 100644 --- a/databases/redis-devel/files/redis.in +++ b/databases/redis-devel/files/redis.in @@ -21,14 +21,14 @@ rcvar="${name}_enable" extra_commands="reload" command="%%PREFIX%%/bin/redis-server" -config_file="%%PREFIX%%/etc/$name.conf" -command_args="${config_file}" pidfile="%%REDIS_RUNDIR%%/$name.pid" -required_files="${config_file}" # read configuration and set defaults load_rc_config "$name" : ${redis_enable="NO"} : ${redis_user="%%REDIS_USER%%"} +: ${redis_config="%%PREFIX%%/etc/$name.conf"} +command_args="${redis_config}" +required_files="${redis_config}" run_rc_command "$1" diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 6636d5c13d9e..554950371b32 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -3,6 +3,7 @@ PORTNAME= redis DISTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ diff --git a/databases/redis/files/redis.in b/databases/redis/files/redis.in index 386639f2c890..ec47419e58c1 100644 --- a/databases/redis/files/redis.in +++ b/databases/redis/files/redis.in @@ -21,14 +21,14 @@ rcvar="${name}_enable" extra_commands="reload" command="%%PREFIX%%/bin/redis-server" -config_file="%%PREFIX%%/etc/$name.conf" -command_args="${config_file}" pidfile="%%REDIS_RUNDIR%%/$name.pid" -required_files="${config_file}" # read configuration and set defaults load_rc_config "$name" : ${redis_enable="NO"} : ${redis_user="%%REDIS_USER%%"} +: ${redis_config="%%PREFIX%%/etc/$name.conf"} +command_args="${redis_config}" +required_files="${redis_config}" run_rc_command "$1" |