From 9f827b93094a30176dfc979bd4b632f774c8892c Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas.matt@sophos.com>
Date: Thu, 13 Nov 2014 11:38:34 +0100
Subject: [PATCH] Start vines if chat and server is enabled

---
 script/server | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/script/server b/script/server
index cc8d59d389..c2da85e67e 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" ]
-- 
GitLab