diff --git a/compose/traefik/traefik.yml b/compose/traefik/traefik.yml index f1c5303..0d8fcf8 100644 --- a/compose/traefik/traefik.yml +++ b/compose/traefik/traefik.yml @@ -23,11 +23,14 @@ entryPoints: # https address: ":443" - # web-socket: - # address: ":8083" + web-socket: + address: ":8083" - # web-socket-secure: - # address: ":8084" + web-socket-secure: + address: ":8084" + + bolt-socket: + address: ":7687" # osrm: # address: ":5000" @@ -196,7 +199,7 @@ http: graph-router: rule: "Host(`neo4j.furyhawk.lol`)" entryPoints: - - web-secure + - bolt-socket middlewares: - csrf service: neo4j-bolt @@ -213,19 +216,21 @@ http: tls: certResolver: letsencrypt - # mqtt-ws-http-router: - # rule: "Host(`mqttx.furyhawk.lol`)" - # entryPoints: - # - web-socket - # service: emqx-web-socket + mqtt-ws-http-router: + rule: "Host(`mqttx.furyhawk.lol`)" + entryPoints: + - web-socket + service: emqx-web-socket + tls: + certResolver: letsencrypt - # mqtt-wss-https-router: - # rule: "Host(`mqttx.furyhawk.lol`)" - # entryPoints: - # - web-socket-secure - # service: emqx-web-socket-secure - # tls: - # certResolver: letsencrypt + mqtt-wss-https-router: + rule: "Host(`mqttx.furyhawk.lol`)" + entryPoints: + - web-socket-secure + service: emqx-web-socket-secure + tls: + certResolver: letsencrypt mqttx-router: rule: "Host(`mqttx.furyhawk.lol`)" @@ -415,7 +420,7 @@ http: mqttx-web: loadBalancer: servers: - - url: http://mqttx_web:8888 + - url: http://mqttx_web:80 streamlit_bai_app: loadBalancer: servers: diff --git a/emqx-docker b/emqx-docker index 5638dfe..57a535e 160000 --- a/emqx-docker +++ b/emqx-docker @@ -1 +1 @@ -Subproject commit 5638dfe4f47cf3d23be78bac9388087e7cdec283 +Subproject commit 57a535e3cdbd46d629e2dcaaf675216fe6a684da diff --git a/production.yml b/production.yml index f46d7b6..4f38937 100644 --- a/production.yml +++ b/production.yml @@ -11,10 +11,6 @@ x-environment: &default-environment volumes: production_traefik: {} portainer_data: {} - # vol-emqx-data1: - # name: foo-emqx-data1 - # vol-emqx-data2: - # name: foo-emqx-data2 services: osrm-backend: @@ -293,6 +289,12 @@ services: ports: - "80:80" - "443:443" + - "7687:7687" + - 1883:1883 + - 8083:8083 + - 8084:8084 + - 8883:8883 + # - 18083:18083 networks: # emqx-bridge: