diff --git a/script/server b/script/server index cc8d59d3899d7929e990682079ad97ca0e9a0fae..c2da85e67e0100f93c4e80d71c0b32666dc06e40 100755 --- a/script/server +++ b/script/server @@ -75,7 +75,10 @@ vars=$(bundle exec ruby ./script/get_config.rb \ port=server.port \ single_process_mode=environment.single_process_mode? \ embed_sidekiq_worker=server.embed_sidekiq_worker \ - workers=server.sidekiq_workers + workers=server.sidekiq_workers \ + chat=chat.enabled \ + chat_server=chat.server.enabled \ + chat_bosh_proxy=chat.server.bosh.proxy ) on_failure "Couldn't parse config/diaspora.yml!" eval "$vars" @@ -138,6 +141,11 @@ https://github.com/diaspora/diaspora/issues/4202 for details fi vines=0 +if [ "$chat" = "true" ] && [ "$chat_server" = "true" ] +then + vines=1 +fi + # Start Diaspora echo -n "Starting Diaspora in $RAILS_ENV mode on port $port " if [ "$embed_sidekiq_worker" = "true" ]