Commit 5468fe8e authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Set proxy timeout

parent 8922da13
...@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b ...@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
[template-default-slave-virtualhost] [template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in filename = templates/default-virtualhost.conf.in
md5sum = 3913387908485adc07b1cd89ad899cd5 md5sum = fa822e94cf39d94297604d8a499b4557
[template-cached-slave-virtualhost] [template-cached-slave-virtualhost]
filename = templates/cached-virtualhost.conf.in filename = templates/cached-virtualhost.conf.in
......
...@@ -46,9 +46,6 @@ ...@@ -46,9 +46,6 @@
# TODO-Caddy Protocols h2 http/1.1 # TODO-Caddy Protocols h2 http/1.1
{% endif -%} {% endif -%}
# TODO-Caddy # Rewrite part
# TODO-Caddy ProxyTimeout 600
{% if disable_via_header %} {% if disable_via_header %}
# TODO-Caddy Header unset Via # TODO-Caddy Header unset Via
{% endif -%} {% endif -%}
...@@ -69,6 +66,7 @@ ...@@ -69,6 +66,7 @@
{% if slave_type == 'zope' and backend_url %} {% if slave_type == 'zope' and backend_url %}
proxy / {{ backend_url }} { proxy / {{ backend_url }} {
transparent transparent
timeout 600s
} }
{% if 'default-path' in slave_parameter %} {% if 'default-path' in slave_parameter %}
redir 301 { redir 301 {
...@@ -95,6 +93,7 @@ ...@@ -95,6 +93,7 @@
proxy / {{ backend_url }} { proxy / {{ backend_url }} {
transparent transparent
timeout 600s
{%- if not ssl_proxy_verify %} {%- if not ssl_proxy_verify %}
insecure_skip_verify insecure_skip_verify
{%- endif %} {%- endif %}
...@@ -118,8 +117,6 @@ ...@@ -118,8 +117,6 @@
# TODO-Caddy #SSLProxyCheckPeerCN on # TODO-Caddy #SSLProxyCheckPeerCN on
# TODO-Caddy SSLProxyCheckPeerExpire on # TODO-Caddy SSLProxyCheckPeerExpire on
{% endif %} {% endif %}
# TODO-Caddy # Rewrite part
# TODO-Caddy ProxyTimeout 600
{% if disable_via_header %} {% if disable_via_header %}
# TODO-Caddy Header unset Via # TODO-Caddy Header unset Via
...@@ -157,6 +154,7 @@ ...@@ -157,6 +154,7 @@
{% elif slave_type == 'zope' and backend_url %} {% elif slave_type == 'zope' and backend_url %}
proxy / {{ backend_url }} { proxy / {{ backend_url }} {
transparent transparent
timeout 600s
} }
{% if 'default-path' in slave_parameter %} {% if 'default-path' in slave_parameter %}
redir 301 { redir 301 {
...@@ -178,6 +176,7 @@ ...@@ -178,6 +176,7 @@
{%- if slave_parameter.get('url', '') %} {%- if slave_parameter.get('url', '') %}
proxy / {{ slave_parameter.get('url', '') }} { proxy / {{ slave_parameter.get('url', '') }} {
transparent transparent
timeout 600s
{%- if not ssl_proxy_verify %} {%- if not ssl_proxy_verify %}
insecure_skip_verify insecure_skip_verify
{%- endif %} {%- endif %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment