Skip to content
Extraits de code Groupes Projets
Valider 9f827b93 rédigé par Lukas Matt's avatar Lukas Matt
Parcourir les fichiers

Start vines if chat and server is enabled

parent 09560882
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -75,7 +75,10 @@ vars=$(bundle exec ruby ./script/get_config.rb \ ...@@ -75,7 +75,10 @@ vars=$(bundle exec ruby ./script/get_config.rb \
port=server.port \ port=server.port \
single_process_mode=environment.single_process_mode? \ single_process_mode=environment.single_process_mode? \
embed_sidekiq_worker=server.embed_sidekiq_worker \ 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!" on_failure "Couldn't parse config/diaspora.yml!"
eval "$vars" eval "$vars"
...@@ -138,6 +141,11 @@ https://github.com/diaspora/diaspora/issues/4202 for details ...@@ -138,6 +141,11 @@ https://github.com/diaspora/diaspora/issues/4202 for details
fi fi
vines=0 vines=0
if [ "$chat" = "true" ] && [ "$chat_server" = "true" ]
then
vines=1
fi
# Start Diaspora # Start Diaspora
echo -n "Starting Diaspora in $RAILS_ENV mode on port $port " echo -n "Starting Diaspora in $RAILS_ENV mode on port $port "
if [ "$embed_sidekiq_worker" = "true" ] if [ "$embed_sidekiq_worker" = "true" ]
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter