Commit f0d5ff12 authored by Lukas Matt's avatar Lukas Matt
Browse files

Diaspora configuration wrapper for Prosody 



Signed-off-by: default avatarLukas Matt <lukas@zauberstuhl.de>
parent 7dbd94b3

.gitignore

+3 −2
Original line number Diff line number Diff line 
# XMPP certificates, keys and user data

config/vines/*.crt

config/vines/*.key

config/certs/*.crt

config/certs/*.key

config/prosody.cfg.lua



# Trademark sillyness

app/views/home/_show.*

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ gem "openid_connect", "0.10.0" 
gem "active_model_serializers", "0.9.4"



# XMPP chat dependencies

gem "diaspora-vines",             "~> 0.2.0.develop"

gem "diaspora-prosody-config",    "~> 0.0.4"

gem "rails-assets-diaspora_jsxc", "~> 0.1.5.develop", source: "https://rails-assets.org"



# Tags

Gemfile.lock

+2 −13
Original line number Diff line number Diff line
@@ -173,13 +173,7 @@ GEM 
    devise_lastseenable (0.0.6)

      devise

      rails (>= 3.0.4)

    diaspora-vines (0.2.0.develop.4)

      activerecord (~> 4.1)

      bcrypt (~> 3.1)

      em-hiredis (~> 0.3.0)

      eventmachine (~> 1.0.8)

      http_parser.rb (~> 0.6)

      nokogiri (~> 1.6)

    diaspora-prosody-config (0.0.4)

    diaspora_federation (0.0.13)

      faraday (~> 0.9.0)

      faraday_middleware (~> 0.10.0)
@@ -202,16 +196,12 @@ GEM 
      execjs

    eco-source (1.1.0.rc.1)

    ejs (1.1.1)

    em-hiredis (0.3.1)

      eventmachine (~> 1.0)

      hiredis (~> 0.6.0)

    entypo-rails (3.0.0.pre.rc2)

      railties (>= 4.1, <= 5)

    equalizer (0.0.10)

    erubis (2.7.0)

    ethon (0.8.1)

      ffi (>= 1.3.0)

    eventmachine (1.0.9.1)

    excon (0.45.4)

    execjs (2.6.0)

    eye (0.8)
@@ -406,7 +396,6 @@ GEM 
    hashdiff (0.2.3)

    hashie (3.4.3)

    hike (1.2.3)

    hiredis (0.6.1)

    hitimes (1.2.3)

    http (1.0.2)

      addressable (~> 2.3)
@@ -915,7 +904,7 @@ DEPENDENCIES 
  devise (= 3.5.6)

  devise-token_authenticatable (~> 0.4.0)

  devise_lastseenable (= 0.0.6)

  diaspora-vines (~> 0.2.0.develop)

  diaspora-prosody-config (~> 0.0.4)

  diaspora_federation-rails (= 0.0.13)

  diaspora_federation-test (= 0.0.13)

  entypo-rails (= 3.0.0.pre.rc2)

config/vines/README→config/certs/README

+7 −0
Original line number Diff line number Diff line 
If you want to encrypt your chat streams with vines.  

Add to `config/vines` your server certificate and key.

If you want to encrypt your chat streams with prosody.

Add to `config/certs` your server certificate and key.



The domain name should be included in the file name e.g.:

config/defaults.yml

+4 −18
Original line number Diff line number Diff line
@@ -51,30 +51,16 @@ defaults: 
    enabled: false

    server:

      enabled: true

      certs: 'config/vines'

      accept_self_signed: false

      cross_domain_messages: true

      max_offline_msgs: 150

      c2s:

        address: '0.0.0.0'

        port: 5222

        max_stanza_size: 65536

        max_resources_per_account: 5

      s2s:

        address: '0.0.0.0'

        port: 5269

        max_stanza_size: 131072

        blacklist: []

      certs: "config/certs"

      bosh:

        proxy: false

        address: '0.0.0.0'

        port: 5280

        bind: '/http-bind'

        max_stanza_size: 65536

        max_resources_per_account: 5

      log:

        file: 'log/vines.log'

        level: 'info'

        info: 'log/prosody.log'

        error: 'log/prosody.err'

        debug: false

  map:

    mapbox:

      enabled: false