Merge branch 'next-minor' into develop

Changelog.md

@@ -36,6 +36,7 @@
 * The "subscribe" indicator on a post now gets toggled when you like or rehsare a post [#7040](https://github.com/diaspora/diaspora/pull/7040)
 * Add OpenGraph video support [#7043](https://github.com/diaspora/diaspora/pull/7043)
 * You'll now get redirected to the invites page if you follow an invitation but you're already logged in [#7061](https://github.com/diaspora/diaspora/pull/7061)
+* Add support for setting BOSH access protocol via chat configuration [#7100](https://github.com/diaspora/diaspora/pull/7100)
 
 # 0.6.0.0
 

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

config/defaults.yml

@@ -56,6 +56,7 @@ defaults:
       certs: "config/certs"
       bosh:
         proxy: false
+        proto: 'http'
         address: '0.0.0.0'
         port: 5280
         bind: '/http-bind'

config/diaspora.yml.example

@@ -246,6 +246,9 @@ configuration: ## Section
         ## connect directly to the port specified below.
         #proxy: true
 
+        ## Configure the protocol used to access the BOSH endpoint
+        #proto: http
+
         ## Configure the address that vines should listen on.
         #address: '0.0.0.0'