From 99ac8c82cf730bc217443b1c9ca12f7a710c2503 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 7 May 2015 07:18:26 +0200
Subject: [PATCH] Added own config for websocket port.

---
 .../app/lib/app_post/websocket.js.coffee       |  3 ++-
 db/seeds.rb                                    | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
index cdefa118c..22db43da0 100644
--- a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
+++ b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
@@ -185,7 +185,8 @@ class _webSocketSingleton extends App.Controller
     if @backend is 'websocket'
       @ws = new window.WebSocket( protocol + window.location.hostname + '/ws' )
     else if @backend is 'websocketPort'
-      @ws = new window.WebSocket( protocol + window.location.hostname + ':6042/' )
+      websocket_port = App.Config.get('websocket_port') || '6042'
+      @ws            = new window.WebSocket( protocol + window.location.hostname + ':' + websocket_port + '/' )
     else
       @_ajaxInit()
 
diff --git a/db/seeds.rb b/db/seeds.rb
index 4b66c0e4f..2b5b06a8f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -131,6 +131,24 @@ Setting.create_if_not_exists(
   state: 'zammad.example.com',
   frontend: true
 )
+Setting.create_if_not_exists(
+  title: 'websocket port',
+  name: 'websocket_port',
+  area: 'System::WebSocket',
+  description: 'Defines the port of the websocket server.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: false,
+        name: 'websocket_port',
+        tag: 'input',
+      },
+    ],
+  },
+  state: '6042',
+  frontend: true
+)
 Setting.create_if_not_exists(
   title: 'http type',
   name: 'http_type',