Skip to content
Snippets Groups Projects
Commit 1bebb295 authored by jurgenhaas's avatar jurgenhaas
Browse files

Do path redirects before the domain redirects as they are more specific

parent ae1b9959
No related branches found
No related tags found
No related merge requests found
...@@ -71,8 +71,9 @@ frontend http_in ...@@ -71,8 +71,9 @@ frontend http_in
{% endfor %} {% endfor %}
http-request set-header x-routing-host undefined http-request set-header x-routing-host undefined
acl letsencrypt_challenge path_beg /.well-known/acme-challenge/ acl letsencrypt_challenge path_beg /.well-known/acme-challenge/
http-request redirect code 301 location %[capture.req.uri,map(/etc/haproxy/redirect.path.map)] if !letsencrypt_challenge { capture.req.uri,map(/etc/haproxy/redirect.path.map) -m
http-request redirect code 301 location %[hdr(host),map(/etc/haproxy/redirect.domain.map)] if !letsencrypt_challenge { hdr(host),map(/etc/haproxy/redirect.domain.map) -m found } http-request redirect code 301 location %[hdr(host),map(/etc/haproxy/redirect.domain.map)] if !letsencrypt_challenge { hdr(host),map(/etc/haproxy/redirect.domain.map) -m found }
http-request redirect code 301 location %[capture.req.uri,map(/etc/haproxy/redirect.path.map)] if !letsencrypt_challenge { capture.req.uri,map(/etc/haproxy/redirect.path.map) -m found } found }
{% if haproxy_private is defined %} {% if haproxy_private is defined %}
{% if haproxy_private.domain is defined %} {% if haproxy_private.domain is defined %}
acl privatedomain hdr(host) -i -n -f /etc/haproxy/privatelist.domain acl privatedomain hdr(host) -i -n -f /etc/haproxy/privatelist.domain
...@@ -190,8 +191,8 @@ frontend http_in ...@@ -190,8 +191,8 @@ frontend http_in
frontend https_in_{{ cert.ip }} frontend https_in_{{ cert.ip }}
bind {{ cert.ip }}:443 ssl crt /etc/haproxy/certs/{{ cert.file }} no-sslv3 bind {{ cert.ip }}:443 ssl crt /etc/haproxy/certs/{{ cert.file }} no-sslv3
http-request del-header Proxy http-request del-header Proxy
http-request redirect code 301 location %[hdr(host),map(/etc/haproxy/redirect.domain.map)] if { hdr(host),map(/etc/haproxy/redirect.domain.map) -m found }
http-request redirect code 301 location %[capture.req.uri,map(/etc/haproxy/redirect.path.map)] if { capture.req.uri,map(/etc/haproxy/redirect.path.map) -m found } http-request redirect code 301 location %[capture.req.uri,map(/etc/haproxy/redirect.path.map)] if { capture.req.uri,map(/etc/haproxy/redirect.path.map) -m found }
http-request redirect code 301 location %[hdr(host),map(/etc/haproxy/redirect.domain.map)] if { hdr(host),map(/etc/haproxy/redirect.domain.map) -m found }
{% if haproxy_private is defined %} {% if haproxy_private is defined %}
{% if haproxy_private.domain is defined %} {% if haproxy_private.domain is defined %}
acl privatedomain hdr(host) -i -n -f /etc/haproxy/privatelist.domain acl privatedomain hdr(host) -i -n -f /etc/haproxy/privatelist.domain
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment