Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / utils / install_server.sh

diff --git a/utils/install_server.sh b/utils/install_server.sh
index 71c57d70dd68ed3933649ca9d70557ad85239768..eedd80342fac78b333e8bf1ee658a78263947ae0 100755 (executable)
--- a/utils/install_server.sh
+++ b/utils/install_server.sh
@@ -99,11 +99,15 @@ if [ ! -f "$REDIS_EXECUTABLE" ] ; then
        
 fi
 
        
 fi
 

+

 #render the tmplates
 TMP_FILE="/tmp/$REDIS_PORT.conf"
 TPL_FILE="./redis.conf.tpl"
 INIT_TPL_FILE="./redis_init_script.tpl"
 INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT"
 #render the tmplates
 TMP_FILE="/tmp/$REDIS_PORT.conf"
 TPL_FILE="./redis.conf.tpl"
 INIT_TPL_FILE="./redis_init_script.tpl"
 INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT"

+PIDFILE="/var/run/redis_$REDIS_PORT.pid"
+
+

 
 #check the default for redis cli
 CLI_EXEC=`which redis-cli`
 
 #check the default for redis cli
 CLI_EXEC=`which redis-cli`


@@ -126,8 +130,9 @@ REDIS_INIT_HEADER=\
 #Configurations injected by install_server below....\n\n
 EXEC=$REDIS_EXECUTABLE\n
 CLIEXEC=$CLI_EXEC\n
 #Configurations injected by install_server below....\n\n
 EXEC=$REDIS_EXECUTABLE\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"
 
 #combine the header and the template (which is actually a static footer)
 ###############\n\n"
 
 #combine the header and the template (which is actually a static footer)