fixes to install script

This commit is contained in:
dvir volk 2011-10-04 16:58:55 +02:00
parent 909aee2c6c
commit 9a01957f68
2 changed files with 7 additions and 2 deletions

View File

@ -99,11 +99,15 @@ if [ ! -f "$REDIS_EXECUTABLE" ] ; then
fi fi
#render the tmplates #render the tmplates
TMP_FILE="/tmp/$REDIS_PORT.conf" TMP_FILE="/tmp/$REDIS_PORT.conf"
TPL_FILE="./redis.conf.tpl" TPL_FILE="./redis.conf.tpl"
INIT_TPL_FILE="./redis_init_script.tpl" INIT_TPL_FILE="./redis_init_script.tpl"
INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT" INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT"
PIDFILE="/var/run/redis_$REDIS_PORT.pid"
#check the default for redis cli #check the default for redis cli
CLI_EXEC=`which redis-cli` CLI_EXEC=`which redis-cli`
@ -126,8 +130,9 @@ REDIS_INIT_HEADER=\
#Configurations injected by install_server below....\n\n #Configurations injected by install_server below....\n\n
EXEC=$REDIS_EXECUTABLE\n EXEC=$REDIS_EXECUTABLE\n
CLIEXEC=$CLI_EXEC\n CLIEXEC=$CLI_EXEC\n
PIDFILE=/var/run/redis_${REDIS_PORT}.pid\n PIDFILE=$PIDFILE\n
CONF=\"$REDIS_CONFIG_FILE\"\n\n CONF=\"$REDIS_CONFIG_FILE\"\n\n
REDISPORT=\"$REDIS_PORT\"\n\n
###############\n\n" ###############\n\n"
#combine the header and the template (which is actually a static footer) #combine the header and the template (which is actually a static footer)

View File

@ -18,7 +18,7 @@ daemonize yes
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here. # default. You can specify a custom pid file location here.
pidfile /var/run/redis.pid pidfile $PIDFILE
# Accept connections on the specified port, default is 6379. # Accept connections on the specified port, default is 6379.
# If port 0 is specified Redis will not listen on a TCP socket. # If port 0 is specified Redis will not listen on a TCP socket.