nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '819-checks-for-redis-conf-in-usr-local-etc' of https://github.com/Dorian/diaspora

Browse source 
Conflicts:
	script/server
This commit is contained in:
MrZYX 2011-01-27 18:29:18 +01:00
commit 60c0c4dc76
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
script/server
View file

@ -67,6 +67,10 @@ function redis_config
elif [ -r "/opt/local/etc/redis.conf" ]; then
# MacPorts location
redis_conf="/opt/local/etc/redis.conf"
elif [ -r "/usr/local/etc/redis.conf" ]; then
redis_conf="/usr/local/etc/redis.conf"
elif [ -r "/usr/local/etc/redis/redis.conf" ]; then
redis_conf="/usr/local/etc/redis/redis.conf"
else
echo "Don't know how to configure redis for this platform. Copy the configuration file redis.conf to the config directory and patch it manually. In particular, don't daemonize." >&2
return