diff options
author | Dennis Schubert <mail@dennis-schubert.de> | 2019-10-19 00:14:14 +0300 |
---|---|---|
committer | Dennis Schubert <mail@dennis-schubert.de> | 2019-10-19 00:14:14 +0300 |
commit | 862fa38f8b4b4a2e96f1919807f20c33b5399d9e (patch) | |
tree | 6e87b49f4d96125aa3f2996d5fce7f7d974b5878 /script | |
parent | 995f3394a86ae1df2814d8242771d44d86bf4bc0 (diff) |
Remove the JSXC/Prosody integration.
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718, nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
Diffstat (limited to 'script')
-rwxr-xr-x | script/server | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/script/server b/script/server index 9cc8ee51a..86151d973 100755 --- a/script/server +++ b/script/server @@ -110,9 +110,6 @@ vars=$(bin/bundle exec ruby ./script/get_config.rb \ single_process_mode=environment.single_process_mode? \ embed_sidekiq_worker=server.embed_sidekiq_worker \ workers=server.sidekiq_workers \ - chat=chat.enabled \ - chat_server=chat.server.enabled \ - chat_bosh_proxy=chat.server.bosh.proxy \ redis_url=environment.redis \ | grep -vE "is not writable|as your home directory temporarily" ) @@ -189,19 +186,6 @@ https://github.com/diaspora/diaspora/issues/4202 for details " fi -if [ "$chat" = "true" -a "$chat_server" = "true" -a "$chat_bosh_proxy" = "false" ] -then - warning " -***************************************************************** -You enabled the chat feature but haven't configured BOSH! That -could lead to mixed-content problems with the http clients. Please -think about editing your proxy configuration as described in: - -diaspora.yml.example -***************************************************************** -" -fi - # Use libjemalloc if it's available for better memory usage command -v ldconfig > /dev/null 2>&1 if [ $? -eq 0 ]; then |