diff options
| author | Lance Gilbert <lance@sigma.social> | 2016-09-14 08:57:22 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2016-09-18 23:31:11 +0300 |
| commit | a9d77c6b1b9964041265f7546645eb8b437cf3ab (patch) | |
| tree | f19c1dfbb2c52fc499ef2646e5537b14591a3e73 /app/helpers | |
| parent | 8ee92e34aa0f25dff02cd24ecb7a84863cb041f1 (diff) | |
Enable setting BOSH access protocol via chat configuration
closes #7100
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/jsxc_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/jsxc_helper.rb b/app/helpers/jsxc_helper.rb index 222763529..9c07dcd6a 100644 --- a/app/helpers/jsxc_helper.rb +++ b/app/helpers/jsxc_helper.rb @@ -1,11 +1,12 @@ module JsxcHelper def get_bosh_endpoint + proto = AppConfig.chat.server.bosh.proto port = AppConfig.chat.server.bosh.port bind = AppConfig.chat.server.bosh.bind host = AppConfig.pod_uri.host unless AppConfig.chat.server.bosh.proxy? - return "http://#{host}:#{port}#{bind}" + return "#{proto}://#{host}:#{port}#{bind}" end AppConfig.url_to bind end |