Domogik + Reverse Proxy

[overload08]

diff --git a/src/domogik/admin/themes/default/templates/base/base.html b/src/domogik/admin/themes/default/templates/base/base.html
index 53208298e..fccc03f95 100644
--- a/src/domogik/admin/themes/default/templates/base/base.html
+++ b/src/domogik/admin/themes/default/templates/base/base.html
@@ -30,7 +30,7 @@
                 protocol = "ws:"
             else
                 protocol = "wss:"
-            var ws = new WebSocket(protocol + "//" + location.hostname + ":{{ ws_port }}/ws");
+            var ws = new WebSocket(protocol + "//" + location.hostname + "/ws/");
        } else {
             alert('No websocket support in this browser. Please use another browser.');
        }
diff --git a/src/domogik/bin/admin.py b/src/domogik/bin/admin.py
index abd332e41..c7b986a2e 100755
--- a/src/domogik/bin/admin.py
+++ b/src/domogik/bin/admin.py
@@ -318,7 +318,7 @@ class Admin(Plugin):
         self.log.info(u"Start WS Server on {0}:{1}...".format(self.interfaces, self.ws_port))
         publisher = MQManager()
         tapp = Application([
-            (r"/ws", WebSocketManager, dict(publisher=publisher))
+            (r"/ws/", WebSocketManager, dict(publisher=publisher))
             ])
 
         # logging

Configuration Nginx for Reverse Proxying Domogik (Port 80) :

server {
        listen 80;
        server_name domogik.domain.fr;

        location / {
                proxy_pass http://dmg_ip:40406/;
        }
        location /ws/ {
                proxy_pass http://dmg_ip:40405/ws/;
                proxy_http_version 1.1;
                proxy_set_header Upgrade $http_upgrade;
                proxy_set_header Connection "upgrade";
                proxy_set_header X-Real-IP $remote_addr;
                proxy_set_header Host $host;
                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        }
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
	access_log /var/log/nginx/access-domogik.log;
	error_log /var/log/nginx/error-domogik.log;
}                                 

Configuration Nginx for Reverse Proxying Domoweb (Port 80) :

server {
        listen 80;
        server_name domoweb.domain.fr;

        location / {
                proxy_pass http://dmg_ip:40404/;
        }
	location /ws/ {
    		proxy_pass http://dmg_ip:40404/ws/;
 		proxy_http_version 1.1;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection "upgrade";
                proxy_set_header X-Real-IP $remote_addr;
                proxy_set_header Host $host;
                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
	}
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
	access_log /var/log/nginx/access-domoweb.log;
	error_log /var/log/nginx/error-domoweb.log;
}  

[jaywax]

Thanks Overlad, working very well with SSL too.

[fritz-smh]

Maybe we should update the doc with the sample config given