s2sPort is now an option

abrown28 · Dec 23, 2011 · a0e53e1 · a0e53e1
1 parent f9e3a5c
commit a0e53e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/s2s.js b/modules/s2s.js
@@ -9,7 +9,7 @@ function S2S() {
 exports.configure = function(server, config) {
     if(config) {
 
-        var s2s = new xmpp.Router(5269, server.options.bindAddress); // We only use 5269 has the default S2S port.
+        var s2s = new xmpp.Router(config.s2sPort, server.options.bindAddress); // We only use 5269 has the default S2S port.
         // Load TLS key material
         if (config.tls) {
             s2s.loadCredentials(config.domain, config.tls.keyPath, config.tls.certPath);

diff --git a/test/functional/s2s-chat.js b/test/functional/s2s-chat.js
@@ -30,8 +30,8 @@ describe('A small chat accross 2 servers', function(){
     var bernard, bianca = null;
 
     before(function(proceed) {
-        server.run({port: 52220, domain: 'bernard.local', bindAddress: '0.0.0.0', s2s: {port: 52690}}, function() {
-            server.run({port: 52221, domain: 'bianca.local', bindAddress: '0.0.0.0', s2s: {port: 52691}}, function() {
+        server.run({port: 52220, domain: 'bernard.local', bindAddress: '0.0.0.0', s2sPort: 52690}, function() {
+            server.run({port: 52221, domain: 'bianca.local', bindAddress: '0.0.0.0', s2sPort: 52691}, function() {
                 proceed();
             });
         });