diff --git a/docker-compose.yml b/docker-compose.yml index d467c4f..b58afed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,6 @@ services: dockerfile: haproxy/Dockerfile volumes: - ./haproxy/haproxy.cfg:/etc/haproxy/haproxy.cfg - - ./haproxy/haproxy.pem:/etc/haproxy/certs/haproxy.pem - ./haproxy/dataplaneapi.hcl:/etc/haproxy/dataplaneapi.hcl - ./haproxy/errors/:/etc/haproxy/errors/ - ./haproxy/map/:/etc/haproxy/map/ diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile index eb41edc..a66e4ab 100644 --- a/haproxy/Dockerfile +++ b/haproxy/Dockerfile @@ -18,7 +18,7 @@ RUN set -eux; \ --uid 99 \ haproxy -ENV HAPROXY_URL http://www.haproxy.org/download/2.7/src/snapshot/haproxy-ss-LATEST.tar.gz +ENV HAPROXY_URL http://www.haproxy.org/download/2.8/src/snapshot/haproxy-ss-LATEST.tar.gz ENV DATAPLANEAPI_URL https://github.com/haproxytech/dataplaneapi/releases/download/v2.7.5/dataplaneapi_2.7.5_Linux_x86_64.tar.gz # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments diff --git a/haproxy/map/ddos.map b/haproxy/map/ddos.map index a707ad0..4a6a7fc 100644 --- a/haproxy/map/ddos.map +++ b/haproxy/map/ddos.map @@ -1,4 +1,12 @@ -127.0.0.1 {"m":1,"t":true} +127.0.0.1/0 {"m":0,"t":true} +127.0.0.1/0f {"m":0,"t":false} +127.0.0.1/0n {"m":0} +127.0.0.1/1 {"m":1,"t":true} +127.0.0.1/1f {"m":1,"t":false} +127.0.0.1/1n {"m":1} +127.0.0.1/2 {"m":2,"t":true} +127.0.0.1/2f {"m":2,"t":false} +127.0.0.1/2n {"m":2} 127.0.0.1/captcha {"m":2} localhost {"m":1} localhost/captcha {"m":2}