Skip to content

Fix speedtest routing through HAProxy #5507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alchemistklk wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix speedtest routing through HAProxy #5507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion haproxy/fronts/in_tcpmode.cfg.pj2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ frontend in-tcpmode

use_backend generate_204 if { path -i /{{hconfigs['proxy_path_client']}}/generate_204 }
use_backend generate_204 if { path -i /{{hconfigs['proxy_path']}}/generate_204 }
{% if hconfigs['speed_test'] %}
use_backend nginx_dispatcher_http_h2 if { path_beg /{{hconfigs['proxy_path_client']}}/speedtest/ }
{% endif %}
use_backend hiddifypanel if { path_beg /{{hconfigs['proxy_path_client']}}/ }
use_backend hiddifypanel if { path_beg /{{hconfigs['proxy_path_admin']}}/ hiddifypanel }
use_backend hiddifypanel if { path_beg /{{hconfigs['proxy_path']}}/ hiddifypanel }
Expand Down Expand Up @@ -74,4 +77,3 @@ frontend in-tcpmode


default_backend to_httpmode

4 changes: 3 additions & 1 deletion haproxy/maps/path.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{% if hconfigs['speed_test'] %}
/{{hconfigs['proxy_path_client']}}/speedtest/ nginx_dispatcher_http_h2
{% endif %}
/{{hconfigs['proxy_path_client']}}/ hiddifypanel
/{{hconfigs['proxy_path_admin']}}/ hiddifypanel
/{{hconfigs['proxy_path']}}/ hiddifypanel
Expand Down Expand Up @@ -32,4 +35,3 @@
{%endif%}



5 changes: 4 additions & 1 deletion haproxy/maps/path_h2.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/{{hconfigs['proxy_path_client']}}/static/ nginx_dispatcher_http_h2
{% if hconfigs['speed_test'] %}
/{{hconfigs['proxy_path_client']}}/speedtest/ nginx_dispatcher_http_h2
{% endif %}
/{{hconfigs['proxy_path_client']}}/ hiddifypanel
/{{hconfigs['proxy_path_admin']}}/ hiddifypanel
/{{hconfigs['proxy_path']}}/ hiddifypanel
Expand Down Expand Up @@ -37,4 +40,4 @@


/{{hconfigs['proxy_path_client']}}/generate_204 generate_204
/{{hconfigs['proxy_path']}}/generate_204 generate_204
/{{hconfigs['proxy_path']}}/generate_204 generate_204
3 changes: 3 additions & 0 deletions haproxy/maps/path_v10.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
/{{ hconfigs['proxy_path_admin'] }}/proxy-stats/ proxy_stats_ui_backend

/{{hconfigs['proxy_path_client']}}/static/ nginx_dispatcher_http_h2
{% if hconfigs['speed_test'] %}
/{{hconfigs['proxy_path_client']}}/speedtest/ nginx_dispatcher_http_h2
{% endif %}
/{{hconfigs['proxy_path_client']}}/ hiddifypanel
/{{hconfigs['proxy_path_admin']}}/ hiddifypanel
/{{hconfigs['proxy_path']}}/ hiddifypanel
Expand Down