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

get sure script/get_config is executed with the right environment

Browse source
This commit is contained in:
Jonne Hass 2011-09-11 16:46:25 +02:00
parent cce2ab2151
commit 54044067e7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
script/server
View file

@ -35,11 +35,11 @@ fi
# Setup environment
OS=`uname -s`
export RAILS_ENV=$(./script/get_config.rb rails_env script_server)
export DB=$(./script/get_config.rb db script_server)
THIN_PORT=$(./script/get_config.rb thin_port script_server)
eval "DEFAULT_THIN_ARGS=\"$(./script/get_config.rb default_thin_args script_server)\""
SOCKET_PORT=$(./script/get_config.rb socket_port $RAILS_ENV)
export RAILS_ENV=$(bundle exec ruby ./script/get_config.rb rails_env script_server)
export DB=$(bundle exec ruby ./script/get_config.rb db script_server)
THIN_PORT=$(bundle exec ruby ./script/get_config.rb thin_port script_server)
eval "DEFAULT_THIN_ARGS=\"$(bundle exec ruby ./script/get_config.rb default_thin_args script_server)\""
SOCKET_PORT=$(bundle exec ruby ./script/get_config.rb socket_port $RAILS_ENV)
# Backward compatibillity, overide default settings
[ -e config/server.sh ] && source config/server.sh
@ -153,7 +153,7 @@ fi
# Start Diaspora
if [ "$(./script/get_config.rb 'single_process_mode?')" != "true" ]; then
if [ "$(bundle exec ruby ./script/get_config.rb 'single_process_mode?')" != "true" ]; then
redis_config
redis-server config/redis.conf &>log/redis-console.log &