dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
Andrew Shvayka 2018-10-26 17:55:51 +03:00
commit 8523ebdaa4
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-compose.yml
View File

@ -146,7 +146,7 @@ services:
haproxy: haproxy:
restart: always restart: always
container_name: haproxy-certbot container_name: haproxy-certbot
image: nmarus/haproxy-certbot image: xalauc/haproxy-certbot:1.7.9
volumes: volumes:
- ./haproxy/config:/config - ./haproxy/config:/config
- ./haproxy/letsencrypt:/etc/letsencrypt - ./haproxy/letsencrypt:/etc/letsencrypt

23
docker/haproxy/config/haproxy.cfg
View File

@ -23,6 +23,13 @@ defaults
timeout connect 5000ms timeout connect 5000ms
timeout client 50000ms timeout client 50000ms
timeout server 50000ms timeout server 50000ms
timeout tunnel 1h # timeout to use with WebSocket and CONNECT
default-server init-addr none
#enable resolving throught docker dns and avoid crashing if service is down while proxy is starting
resolvers docker_resolver
nameserver dns 127.0.0.11:53
listen stats listen stats
bind *:9999 bind *:9999
@ -39,8 +46,8 @@ listen mqtt-in
timeout server 3h timeout server 3h
option tcplog option tcplog
balance leastconn balance leastconn
server tbMqtt1 tb-mqtt-transport1:1883 check server tbMqtt1 tb-mqtt-transport1:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbMqtt2 tb-mqtt-transport2:1883 check server tbMqtt2 tb-mqtt-transport2:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
frontend http-in frontend http-in
bind *:${HTTP_PORT} bind *:${HTTP_PORT}
@ -81,20 +88,20 @@ backend tb-web-backend
balance leastconn balance leastconn
option tcp-check option tcp-check
option log-health-checks option log-health-checks
server tbWeb1 tb-web-ui1:8080 check server tbWeb1 tb-web-ui1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbWeb2 tb-web-ui2:8080 check server tbWeb2 tb-web-ui2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
http-request set-header X-Forwarded-Port %[dst_port] http-request set-header X-Forwarded-Port %[dst_port]
backend tb-http-backend backend tb-http-backend
balance leastconn balance leastconn
option tcp-check option tcp-check
option log-health-checks option log-health-checks
server tbHttp1 tb-http-transport1:8081 check server tbHttp1 tb-http-transport1:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbHttp2 tb-http-transport2:8081 check server tbHttp2 tb-http-transport2:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4
backend tb-api-backend backend tb-api-backend
balance leastconn balance leastconn
option tcp-check option tcp-check
option log-health-checks option log-health-checks
server tbApi1 tb1:8080 check server tbApi1 tb1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbApi2 tb2:8080 check server tbApi2 tb2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4