diff options
author | Lukas Matt <lukas.matt@sophos.com> | 2014-11-13 13:38:34 +0300 |
---|---|---|
committer | Lukas Matt <lukas.matt@sophos.com> | 2014-11-13 13:38:34 +0300 |
commit | 9f827b93094a30176dfc979bd4b632f774c8892c (patch) | |
tree | 70f82728347d84ce4067a506d23ef7f38152852e /script | |
parent | 095608827e3629c82541a9eda7089b823b0d5c81 (diff) |
Start vines if chat and server is enabled
Diffstat (limited to 'script')
-rwxr-xr-x | script/server | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/script/server b/script/server index cc8d59d38..c2da85e67 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" ] |