diff options
| author | Jonne Haß <me@jhass.eu> | 2015-05-17 19:48:02 +0300 |
|---|---|---|
| committer | Dennis Schubert <mail@dennis-schubert.de> | 2015-05-19 03:55:31 +0300 |
| commit | 4bde00177cf81fe516be5d5a83fc68d78780a480 (patch) | |
| tree | b3a103b4213df4228cfe890bb92ce66bb9fccaed /script | |
| parent | a21de8b190a39753aea838e982a606340342e0e5 (diff) | |
replace foreman with eye
closes #5966
Diffstat (limited to 'script')
| -rwxr-xr-x | script/server | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/script/server b/script/server index 17f5784e7..466b4ef0f 100755 --- a/script/server +++ b/script/server @@ -182,13 +182,9 @@ https://github.com/diaspora/diaspora/issues/4202 for details " fi -vines=0 -if [ "$chat" = "true" ] && [ "$chat_server" = "true" ] +if [ "$chat" = "true" -a "$chat_server" = "true" -a "$chat_bosh_proxy" = "false" ] then - vines=1 - if [ "$chat_bosh_proxy" = "false" ] - then - warning " + warning " ***************************************************************** You enabled the chat feature but haven't configured BOSH! That could lead to mixed-content problems with the http clients. Please @@ -204,7 +200,6 @@ printf "Starting Diaspora in $RAILS_ENV mode " if [ -n "$PORT" ] then printf "on port $PORT " - port_option="-p $PORT" fi if [ "$embed_sidekiq_worker" = "true" ] then @@ -219,4 +214,4 @@ else fi echo "" -exec bin/bundle exec foreman start -m "xmpp=$vines,web=1,sidekiq=$workers" $port_option +exec bin/bundle exec loader_eye -st -c config/eye.rb |