OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-26 13:48:53 +08:00
Code Issues Projects Releases Wiki Activity

NOISSUE - Enable MQTT over WS in docker composition (#1085)

Browse Source 
* Enable WS over MQTT docker composition

Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com>

* Remove commented code

Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com>
This commit is contained in:
Nikola Marčetić 2020-03-25 22:26:50 +01:00 committed by GitHub
parent c1df2cb21c
commit 70955d1937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/docker-compose.yml
View File

@ -209,10 +209,6 @@ services:
environment:
DOCKER_VERNEMQ_ALLOW_ANONYMOUS: "on"
DOCKER_VERNEMQ_LOG__CONSOLE__LEVEL: debug
ports:
- 18831:${MF_MQTT_BROKER_PORT}
- 8881:${MF_MQTT_BROKER_WS_PORT}
- 7777:8888
networks:
- mainflux-base-net
volumes:
@ -238,9 +234,6 @@ services:
MF_MQTT_ADAPTER_MQTT_TARGET_PORT: ${MF_MQTT_BROKER_PORT}
MF_MQTT_ADAPTER_WS_TARGET_HOST: vernemq
MF_MQTT_ADAPTER_WS_TARGET_PORT: ${MF_MQTT_BROKER_WS_PORT}
ports:
- 18832:${MF_MQTT_ADAPTER_PORT}
- 8882:${MF_MQTT_ADAPTER_WS_PORT}
networks:
- mainflux-base-net

4
docker/nginx/nginx-key.conf
View File

@ -86,10 +86,10 @@ http {
}
# Proxy pass to mainflux-mqtt-adapter over WS
location /mqtt/ {
location /mqtt {
include snippets/proxy-headers.conf;
include snippets/ws-upgrade.conf;
proxy_pass http://mqtt_ws_cluster/;
proxy_pass http://mqtt_ws_cluster;
}
}
}

4
docker/nginx/nginx-x509.conf
View File

@ -95,11 +95,11 @@ http {
}
# Proxy pass to mainflux-mqtt-adapter over WS
location /mqtt/ {
location /mqtt {
include snippets/verify-ssl-client.conf;
include snippets/proxy-headers.conf;
include snippets/ws-upgrade.conf;
proxy_pass http://mqtt_ws_cluster/;
proxy_pass http://mqtt_ws_cluster;
}
}
}

2
go.mod
View File

@ -22,7 +22,7 @@ require (
github.com/influxdata/influxdb v1.6.4
github.com/jmoiron/sqlx v1.2.1-0.20190319043955-cdf62fdf55f6
github.com/lib/pq v1.0.0
github.com/mainflux/mproxy v0.1.5
github.com/mainflux/mproxy v0.1.6
github.com/mainflux/senml v1.0.1
github.com/nats-io/nats.go v1.9.1
github.com/opentracing/opentracing-go v1.1.0

3
go.sum
View File

@ -165,12 +165,15 @@ github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzR
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mainflux/mainflux v0.0.0-20191223163044-f42f2095bab4/go.mod h1:K3ghSIpAqwv5F/t30LO57+11S7tE97ur2Z6wWEHa2CA=
github.com/mainflux/mainflux v0.0.0-20200314190902-c91fe0d45353/go.mod h1:yijZGLNkcDOPJfPhRMwuu5ZFcNHqDHzWurN4q1rOT/Q=
github.com/mainflux/mainflux v0.0.0-20200324100741-6ffa916ed229/go.mod h1:mde8cQhTPjLulu2pn/x8OgQ2S++lDufS+ODE93zuHjY=
github.com/mainflux/mproxy v0.1.3 h1:/JNnxgo/03wSpbwQH2+WE1AzgMWaSKogTVXblh18x5s=
github.com/mainflux/mproxy v0.1.3/go.mod h1:/BdaBfgye1GNCD+eat4ipFamy9IEVRH5nhZS0yEShVg=
github.com/mainflux/mproxy v0.1.4 h1:g7LhJgA+BXlgaZeyLj505aD5DCsrix79TEiLWuHJZd4=
github.com/mainflux/mproxy v0.1.4/go.mod h1:MBLtv/RvhT8QsmXz4g3GxkRaP8PqlVqBWeqvw9QmO8k=
github.com/mainflux/mproxy v0.1.5 h1:a0zKiUyuTDld2TwCuhrOFtUvotcvSfwJMuh/JcrqC6I=
github.com/mainflux/mproxy v0.1.5/go.mod h1:MBLtv/RvhT8QsmXz4g3GxkRaP8PqlVqBWeqvw9QmO8k=
github.com/mainflux/mproxy v0.1.6 h1:In0JkSO7/XU7KdyqCzFfDQW3OOvNZc1tsrq1/aWRkRE=
github.com/mainflux/mproxy v0.1.6/go.mod h1:NnhrUDytvV4pCI5LDuet86/WrymrUaX0/x1tlUHTKhU=
github.com/mainflux/senml v1.0.0 h1:oLS5aBhvdHjgQ8kfq3jX7yD+DaquhvpyvIWNsPil3X0=
github.com/mainflux/senml v1.0.0/go.mod h1:g9i8pj4WMs29KkUpXivbe/PP0qJd1kt3b1CF77S8A3s=
github.com/mainflux/senml v1.0.1 h1:qWKIGeUe7YEygM3xZcJ9Lbq+DHuT8V23dz1hgAYkYEY=

5
vendor/github.com/mainflux/mproxy/pkg/websocket/websocket.go generated vendored
View File

@ -67,7 +67,10 @@ func (p Proxy) pass(in *websocket.Conn) {
Path: p.path,
}
srv, _, err := websocket.DefaultDialer.Dial(url.String(), nil)
dialer := &websocket.Dialer{
Subprotocols: []string{"mqtt"},
}
srv, _, err := dialer.Dial(url.String(), nil)
if err != nil {
p.logger.Error("Unable to connect to broker, reason: " + err.Error())

2
vendor/modules.txt vendored
View File

@ -122,7 +122,7 @@ github.com/lib/pq
github.com/lib/pq/oid
# github.com/magiconair/properties v1.8.1
github.com/magiconair/properties
# github.com/mainflux/mproxy v0.1.5
# github.com/mainflux/mproxy v0.1.6
github.com/mainflux/mproxy/pkg/mqtt
github.com/mainflux/mproxy/pkg/session
github.com/mainflux/mproxy/pkg/websocket