diff options
| author | MrZYX <pr0fkill@gmail.com> | 2011-01-27 20:29:18 +0300 |
|---|---|---|
| committer | MrZYX <pr0fkill@gmail.com> | 2011-01-27 20:29:18 +0300 |
| commit | 60c0c4dc76030cd4308805404e91dd59334ac30b (patch) | |
| tree | df2e563625f9837759fe9add0174241e36c66659 /script | |
| parent | 45c590a3bf0681b8f5d23c80077fbf3bc9133595 (diff) | |
| parent | 3976489984c5ba097e77c50a50757610c6cacbb3 (diff) | |
Merge branch '819-checks-for-redis-conf-in-usr-local-etc' of https://github.com/Dorian/diaspora
Conflicts:
script/server
Diffstat (limited to 'script')
| -rwxr-xr-x | script/server | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/script/server b/script/server index 04359d420..6d71e3a46 100755 --- a/script/server +++ b/script/server @@ -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 |