diff --git a/haproxy/arm/Dockerfile b/haproxy/arm/Dockerfile deleted file mode 100644 index 2ca03ed..0000000 --- a/haproxy/arm/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -# -# Dockerfile for haproxy-arm -# - -FROM easypi/alpine-arm -MAINTAINER EasyPi Software Foundation - -RUN apk add --no-cache haproxy - -CMD ["haproxy", "-f", "/etc/haproxy/haproxy.cfg"] diff --git a/haproxy/arm/docker-compose.yml b/haproxy/arm/docker-compose.yml deleted file mode 100644 index 3001a60..0000000 --- a/haproxy/arm/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -haproxy: - image: easypi/haproxy-arm - volumes: - - ./haproxy.cfg:/etc/haproxy/haproxy.cfg - net: host - restart: always diff --git a/haproxy/arm/haproxy.cfg b/haproxy/arm/haproxy.cfg deleted file mode 100644 index 37f7fc2..0000000 --- a/haproxy/arm/haproxy.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# +- jp (:1081) -# | -# |- tw (:1082) -# frontend --- backend -+ -# (*:1080) |- hk (:1083) -# | -# +- us (:1084) - -global - maxconn 4000 - -defaults - mode tcp - timeout connect 5000ms - timeout client 50000ms - timeout server 50000ms - -frontend front - bind *:1080 - default_backend back - -backend back - balance roundrobin - server jp 127.0.0.1:1081 weight 50 - server tw 127.0.0.1:1082 weight 20 - server hk 127.0.0.1:1083 weight 15 - server us 127.0.0.1:1084 weight 15 diff --git a/haproxy/docker-compose.yml b/haproxy/docker-compose.yml index 55841d1..9b96afa 100644 --- a/haproxy/docker-compose.yml +++ b/haproxy/docker-compose.yml @@ -1,6 +1,8 @@ -haproxy: - image: haproxy:alpine - volumes: - - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg - net: host - restart: always +version: "3.8" +services: + haproxy: + image: haproxy:alpine + volumes: + - ./data:/usr/local/etc/haproxy + network_mode: host + restart: unless-stopped diff --git a/haproxy/haproxy.cfg b/haproxy/haproxy.cfg index 37f7fc2..eca44b3 100644 --- a/haproxy/haproxy.cfg +++ b/haproxy/haproxy.cfg @@ -15,13 +15,21 @@ defaults timeout client 50000ms timeout server 50000ms +frontend stats + mode http + bind *:8404 + stats enable + stats uri /stats + stats refresh 15s + stats admin if TRUE + frontend front bind *:1080 default_backend back backend back balance roundrobin - server jp 127.0.0.1:1081 weight 50 - server tw 127.0.0.1:1082 weight 20 - server hk 127.0.0.1:1083 weight 15 - server us 127.0.0.1:1084 weight 15 + server jp 127.0.0.1:1081 check inter 30s + server tw 127.0.0.1:1082 check inter 30s + server hk 127.0.0.1:1083 check inter 30s + server us 127.0.0.1:1084 check inter 30s