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 0ac98a79ae092668bbe2d1debc726e32d689918c..eedd80342fac78b333e8bf1ee658a78263947ae0 100755 (executable)
--- a/utils/install_server.sh
+++ b/utils/install_server.sh
@@ -1,10 +1,34 @@
 #! /bin/sh
+
+# Copyright 2011 Dvir Volk <dvirsk at gmail dot com>. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+#
+#   1. Redistributions of source code must retain the above copyright notice, this list of
+#      conditions and the following disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above copyright notice, this list
+#      of conditions and the following disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Dvir Volk OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#
+# # # # # # # # # # # # # # # # # # # # # # # # # #
+#
 # Interactive service installer for redis server
 # this generates a redis config file and an /etc/init.d script, and installs them
 # this scripts should be run as root
 #
-# Contributed by Dvir Volk dvirsky at gmail dot com 2011
-# This code is contributed to public domain
 
 
 die () {
@@ -75,11 +99,15 @@ if [ ! -f "$REDIS_EXECUTABLE" ] ; then
        
 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"
+PIDFILE="/var/run/redis_$REDIS_PORT.pid"
+
+
 
 #check the default for redis cli
 CLI_EXEC=`which redis-cli`
@@ -102,8 +130,9 @@ REDIS_INIT_HEADER=\
 #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
+REDISPORT=\"$REDIS_PORT\"\n\n
 ###############\n\n"
 
 #combine the header and the template (which is actually a static footer)