Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Roque
slapos
Commits
5468fe8e
Commit
5468fe8e
authored
May 14, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Set proxy timeout
parent
8922da13
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/templates/default-virtualhost.conf.in
...ware/caddy-frontend/templates/default-virtualhost.conf.in
+4
-5
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
5468fe8e
...
@@ -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
...
...
software/caddy-frontend/templates/default-virtualhost.conf.in
View file @
5468fe8e
...
@@ -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 %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment