diff --git a/docker-compose.yml b/docker-compose.yml index d1ad4ed..7c44749 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: - ./haproxy/backends.map:/etc/haproxy/backends.map - ./haproxy/blocked.map:/etc/haproxy/blocked.map - ./haproxy/dataplaneapi.hcl:/etc/haproxy/dataplaneapi.hcl - - ./haproxy/trace.html:/etc/haproxy/trace.html + - ./haproxy/trace.txt:/etc/haproxy/trace.txt - ./src/scripts/:/etc/haproxy/scripts/ - ./src/libs/:/etc/haproxy/libs/ - ./haproxy/js/:/var/www/js/ @@ -32,9 +32,9 @@ services: - BUCKET_DURATION=43200 - BACKEND_NAME=servers - SERVER_PREFIX=websrv - nginx: - ports: - - 81:80 - image: "nginx:latest" - volumes: - - ./nginx:/usr/share/nginx/html +# nginx: +# ports: +# - 81:80 +# image: "nginx:latest" +# volumes: +# - ./nginx:/usr/share/nginx/html diff --git a/haproxy/haproxy.cfg b/haproxy/haproxy.cfg index 539c580..d91b77b 100644 --- a/haproxy/haproxy.cfg +++ b/haproxy/haproxy.cfg @@ -23,7 +23,7 @@ frontend http-in http-request silent-drop unless is_existing_vhost #debug only, /cdn-cgi/trace - #http-request return status 200 content-type "text/html; charset=utf-8" lf-file /etc/haproxy/trace.html if { path /cdn-cgi/trace } + #http-request return status 200 content-type "text/plain; charset=utf-8" lf-file /etc/haproxy/trace.txt if { path /cdn-cgi/trace } # acl for blocked IPs/subnets acl blocked_ip_or_subnet src,map_ip(/etc/haproxy/blocked.map) -m found @@ -75,7 +75,7 @@ backend servers http-response cache-store basic_cache if can_cache # placeholder servers, activated by LUA or the control panel - server-template websrv 1-100 0.0.0.0:80 check disabled + server-template websrv 1-100 0.0.0.0:80 check disabled ssl verify none # use server based on hostname use-server %[req.hdr(host),lower,map(/etc/haproxy/backends.map)] if TRUE diff --git a/haproxy/trace.html b/haproxy/trace.txt similarity index 53% rename from haproxy/trace.html rename to haproxy/trace.txt index 99a1d89..be55d08 100644 --- a/haproxy/trace.html +++ b/haproxy/trace.txt @@ -1,12 +1,4 @@ - - - - -trace - - -
-ts=%Ts
+ts=%Ts.%ms
 h=%[hdr(host)]
 ip=%ci
 uag=%[req.fhdr(user-agent)]
@@ -16,6 +8,3 @@ tlsv=%sslv
 sni=%[ssl_fc_sni]
 vey_id=%[env(RAY_ID)]
 bucket=%[env(BUCKET_DURATION)]
-
- -