Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
093433c1
Commit
093433c1
authored
Oct 05, 2011
by
Salvatore Sanfilippo
Browse files
Merge pull request #118 from dvirsky/unstable
fixes to install scripts
parents
eab0e26e
9a01957f
Changes
2
Hide whitespace changes
Inline
Side-by-side
utils/install_server.sh
View file @
093433c1
...
...
@@ -99,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
`
...
...
@@ -126,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)
...
...
utils/redis.conf.tpl
View file @
093433c1
...
...
@@ -18,7 +18,7 @@ daemonize yes
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# 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.
# If port 0 is specified Redis will not listen on a TCP socket.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment