diff --git a/bin/start-nginx b/bin/start-nginx index 1d0e3db4..b0d1f589 100755 --- a/bin/start-nginx +++ b/bin/start-nginx @@ -3,13 +3,6 @@ # make sure we kill all child processes once done trap '{ pkill -P $$; rm -f config/nginx.conf; exit 255; }' EXIT -if [[ $RACK_ENV == "production" ]]; then - export tmp_dir=/tmp -else - mkdir -p tmp - export tmp_dir=./tmp -fi - if [ -f bin/nginx ]; then nginx=bin/nginx else diff --git a/script/server b/script/server index c4578701..3afd1c27 100755 --- a/script/server +++ b/script/server @@ -13,6 +13,13 @@ echo "port=$PORT rack_env=$RACK_ENV web_concurrency=$WEB_CONCURRENCY nginx_worke ruby="ruby -I lib -S" bexc="$ruby bundle exec" +if [[ $RACK_ENV == "production" ]]; then + export tmp_dir=/tmp +else + mkdir -p tmp + export tmp_dir=./tmp +fi + cmd="unicorn config.ru -E $RACK_ENV -c config/unicorn.rb" [[ $RACK_ENV == "development" ]] && cmd="rerun -b -- $cmd" cmd="bin/start-nginx $bexec je $cmd"