Compare commits
2 Commits
d8bd645a80
...
601d5fcdc3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
601d5fcdc3 | ||
|
|
c151a2ee0c |
@@ -14,6 +14,7 @@ vhost_basicauth_users: {}
|
|||||||
vhost_proxy_target_netproto: tcp
|
vhost_proxy_target_netproto: tcp
|
||||||
vhost_proxy_target_protocol: http
|
vhost_proxy_target_protocol: http
|
||||||
vhost_proxy_target_host: localhost
|
vhost_proxy_target_host: localhost
|
||||||
|
vhost_proxy_method: ""
|
||||||
vhost_proxy_headers: {}
|
vhost_proxy_headers: {}
|
||||||
vhost_proxy_delete_headers: []
|
vhost_proxy_delete_headers: []
|
||||||
vhost_proxy_pass_host_header: true
|
vhost_proxy_pass_host_header: true
|
||||||
|
|||||||
@@ -103,6 +103,15 @@ argument_specs:
|
|||||||
- Only applicable if vhost_type is reverse_proxy and vhost_proxy_target_netproto is unix.
|
- Only applicable if vhost_type is reverse_proxy and vhost_proxy_target_netproto is unix.
|
||||||
type: str
|
type: str
|
||||||
required: false
|
required: false
|
||||||
|
vhost_proxy_method:
|
||||||
|
description: Method to set for proxied requests
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
default: ""
|
||||||
|
choices:
|
||||||
|
- ""
|
||||||
|
- GET
|
||||||
|
- POST
|
||||||
vhost_proxy_headers:
|
vhost_proxy_headers:
|
||||||
description: Dict of request headers and their values to set for proxied requests
|
description: Dict of request headers and their values to set for proxied requests
|
||||||
type: dict
|
type: dict
|
||||||
@@ -287,6 +296,15 @@ argument_specs:
|
|||||||
type: str
|
type: str
|
||||||
required: false
|
required: false
|
||||||
default: "{{ vhost_proxy_target_socket if vhost_type == 'reverse_proxy' and vhost_proxy_target_netproto == 'unix' else '' }}"
|
default: "{{ vhost_proxy_target_socket if vhost_type == 'reverse_proxy' and vhost_proxy_target_netproto == 'unix' else '' }}"
|
||||||
|
proxy_method:
|
||||||
|
description: Method to set for proxied requests
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
default: "{{ vhost_proxy_method }}"
|
||||||
|
choices:
|
||||||
|
- ""
|
||||||
|
- GET
|
||||||
|
- POST
|
||||||
proxy_headers:
|
proxy_headers:
|
||||||
description: Dict of request headers and their values to set for proxied requests
|
description: Dict of request headers and their values to set for proxied requests
|
||||||
type: dict
|
type: dict
|
||||||
@@ -450,6 +468,15 @@ argument_specs:
|
|||||||
type: str
|
type: str
|
||||||
required: false
|
required: false
|
||||||
default: "{{ vhost_proxy_target_socket if vhost_type == 'reverse_proxy' and vhost_proxy_target_netproto == 'unix' else '' }}"
|
default: "{{ vhost_proxy_target_socket if vhost_type == 'reverse_proxy' and vhost_proxy_target_netproto == 'unix' else '' }}"
|
||||||
|
proxy_method:
|
||||||
|
description: Method to set for proxied requests
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
default: "{{ vhost_proxy_method }}"
|
||||||
|
choices:
|
||||||
|
- ""
|
||||||
|
- GET
|
||||||
|
- POST
|
||||||
proxy_headers:
|
proxy_headers:
|
||||||
description: Dict of request headers and their values to set for proxied requests
|
description: Dict of request headers and their values to set for proxied requests
|
||||||
type: dict
|
type: dict
|
||||||
@@ -629,6 +656,14 @@ argument_specs:
|
|||||||
- Only applicable if type is reverse_proxy and proxy_target_netproto is unix.
|
- Only applicable if type is reverse_proxy and proxy_target_netproto is unix.
|
||||||
type: str
|
type: str
|
||||||
required: false
|
required: false
|
||||||
|
proxy_method:
|
||||||
|
description: Method to set for proxied requests
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
choices:
|
||||||
|
- ""
|
||||||
|
- GET
|
||||||
|
- POST
|
||||||
proxy_headers:
|
proxy_headers:
|
||||||
description: Dict of request headers and their values to set for proxied requests
|
description: Dict of request headers and their values to set for proxied requests
|
||||||
type: dict
|
type: dict
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
handle {
|
handle {
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% for matcher in location.matchers %}
|
{% for matcher in location.matchers %}
|
||||||
{% if matcher.name != '' %}
|
{% if matcher.name != '' %}
|
||||||
@{{ matcher.name }} {
|
@{{ matcher.name }} {
|
||||||
{% if matcher.match_methods | length > 0 %}
|
{% if matcher.match_methods | default([]) | length > 0 %}
|
||||||
method {{ matcher.match_methods | join(' ') }}
|
method {{ matcher.match_methods | join(' ') }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% for header in matcher.match_headers | dict2items %}
|
{% for header in matcher.match_headers | default({}) | dict2items %}
|
||||||
header{{ '_regexp' if header.value.startswith('^') and header.value.endswith('$') else '' }} {{ header.key }} {{ header.value }}
|
header{{ '_regexp' if header.value.startswith('^') and header.value.endswith('$') else '' }} {{ header.key }} {{ header.value }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
}
|
}
|
||||||
@@ -59,6 +59,9 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
}
|
}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if matcher.proxy_method | length > 0 %}
|
||||||
|
method {{ matcher.proxy_method }}
|
||||||
|
{% endif %}
|
||||||
{% for header in matcher.proxy_delete_headers %}
|
{% for header in matcher.proxy_delete_headers %}
|
||||||
header_up -{{ header }}
|
header_up -{{ header }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -79,7 +82,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
}
|
}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
}
|
}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
_vhost_matcher_defaults:
|
_vhost_matcher_defaults:
|
||||||
match_headers: {}
|
match_headers: {}
|
||||||
match_method: []
|
match_methods: []
|
||||||
_vhost_matchers: >-
|
_vhost_matchers: >-
|
||||||
{{
|
{{
|
||||||
vhost_matchers
|
vhost_matchers
|
||||||
@@ -25,6 +25,7 @@ _vhost_location_defaults:
|
|||||||
vhost_type == 'reverse_proxy' and vhost_proxy_target_netproto == 'tcp' else '' }}"
|
vhost_type == 'reverse_proxy' and vhost_proxy_target_netproto == 'tcp' else '' }}"
|
||||||
proxy_target_socket: "{{ vhost_proxy_target_socket if
|
proxy_target_socket: "{{ vhost_proxy_target_socket if
|
||||||
vhost_type == 'reverse_proxy' and vhost_proxy_target_netproto == 'unix' else '' }}"
|
vhost_type == 'reverse_proxy' and vhost_proxy_target_netproto == 'unix' else '' }}"
|
||||||
|
proxy_method: "{{ vhost_proxy_method }}"
|
||||||
proxy_headers: "{{ vhost_proxy_headers }}"
|
proxy_headers: "{{ vhost_proxy_headers }}"
|
||||||
proxy_delete_headers: "{{ vhost_proxy_delete_headers }}"
|
proxy_delete_headers: "{{ vhost_proxy_delete_headers }}"
|
||||||
proxy_pass_host_header: "{{ vhost_proxy_pass_host_header }}"
|
proxy_pass_host_header: "{{ vhost_proxy_pass_host_header }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user