Merge remote-tracking branch 'remotes/dev/1.3' into 1.3

oroinc · Oct 6, 2017 · 335dc65 · 335dc65
2 parents f6c32a8 + 4fbaaf0
commit 335dc65
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -14,12 +14,14 @@ parameters:
     mailer_password:        ~
 
     # WebSocket server config
-    websocket_bind_address:  "0.0.0.0"  # The host IP the socket server will bind to
-    websocket_bind_port:     8080       # The port the socket server will listen on
-    websocket_frontend_host: "*"        # Websocket host the browser will connect to
-    websocket_frontend_port: 8080       # Websocket port the browser will connect to
-    websocket_backend_host:  "*"        # Websocket host the application server will connect to
-    websocket_backend_port:  8080       # Websocket port the application server will connect to
+    websocket_bind_address:    "0.0.0.0"  # The host IP the socket server will bind to
+    websocket_bind_port:       8080       # The port the socket server will listen on
+    websocket_frontend_host:   "*"        # Websocket host the browser will connect to
+    websocket_frontend_port:   8080       # Websocket port the browser will connect to
+    websocket_frontend_path:   ""         # Websocket url path the browser will connect to (for example "/websocket" or "/ws")
+    websocket_backend_host:    "*"        # Websocket host the application server will connect to
+    websocket_backend_port:    8080       # Websocket port the application server will connect to
+    websocket_backend_path:    ""         # Websocket url path the application server will connect to (for example "/websocket" or "/ws")
 
     # Used to hide backend under specified prefix, should be started with "/", for instance "/admin"
     web_backend_prefix:         '/admin'

diff --git a/app/config/parameters_test.yml.dist b/app/config/parameters_test.yml.dist
@@ -14,12 +14,14 @@ parameters:
     mailer_password:        ~
 
     # WebSocket server config
-    websocket_bind_address:  "0.0.0.0"  # The host IP the socket server will bind to
-    websocket_bind_port:     8080       # The port the socket server will listen on
-    websocket_frontend_host: "*"        # Websocket host the browser will connect to
-    websocket_frontend_port: 8080       # Websocket port the browser will connect to
-    websocket_backend_host:  "*"        # Websocket host the application server will connect to
-    websocket_backend_port:  8080       # Websocket port the application server will connect to
+    websocket_bind_address:    "0.0.0.0"  # The host IP the socket server will bind to
+    websocket_bind_port:       8080       # The port the socket server will listen on
+    websocket_frontend_host:   "*"        # Websocket host the browser will connect to
+    websocket_frontend_port:   8080       # Websocket port the browser will connect to
+    websocket_frontend_path:   ""         # Websocket url path the browser will connect to (for example "/websocket" or "/ws")
+    websocket_backend_host:    "*"        # Websocket host the application server will connect to
+    websocket_backend_port:    8080       # Websocket port the application server will connect to
+    websocket_backend_path:    ""         # Websocket url path the application server will connect to (for example "/websocket" or "/ws")
 
     # Used to hide backend under specified prefix, should be started with "/", for instance "/admin"
     web_backend_prefix:         '/admin'