Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
ceffee03
Commit
ceffee03
authored
May 14, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Set proxy timeout
parent
ee5fd2ff
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 @
ceffee03
...
@@ -55,7 +55,7 @@ md5sum = 4dbb8560e4de1af2a0706b020e713fe7
...
@@ -55,7 +55,7 @@ md5sum = 4dbb8560e4de1af2a0706b020e713fe7
[template-default-slave-virtualhost]
[template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in
filename = templates/default-virtualhost.conf.in
md5sum =
ae1f697a837ea31524278b35af74a823
md5sum =
1f70a3005915e84091bfd6cb7c77b05c
[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 @
ceffee03
...
@@ -45,9 +45,6 @@
...
@@ -45,9 +45,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 -%}
...
@@ -68,6 +65,7 @@
...
@@ -68,6 +65,7 @@
{% if slave_type == 'zope' -%}
{% if slave_type == 'zope' -%}
proxy / {{ slave_parameter.get('https-url', slave_parameter.get('url', '')) }} {
proxy / {{ slave_parameter.get('https-url', slave_parameter.get('url', '')) }} {
transparent
transparent
timeout 600s
}
}
{% if 'default-path' in slave_parameter %}
{% if 'default-path' in slave_parameter %}
redir 301 {
redir 301 {
...
@@ -92,6 +90,7 @@
...
@@ -92,6 +90,7 @@
{% endif -%}
{% endif -%}
proxy / {{ slave_parameter.get('https-url', slave_parameter.get('url', '')) }} {
proxy / {{ slave_parameter.get('https-url', 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 %}
...
@@ -114,8 +113,6 @@
...
@@ -114,8 +113,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
...
@@ -153,6 +150,7 @@
...
@@ -153,6 +150,7 @@
{% elif slave_type == 'zope' -%}
{% elif slave_type == 'zope' -%}
proxy / {{ slave_parameter.get('https-url', slave_parameter.get('url', '')) }} {
proxy / {{ slave_parameter.get('https-url', slave_parameter.get('url', '')) }} {
transparent
transparent
timeout 600s
}
}
{% if 'default-path' in slave_parameter %}
{% if 'default-path' in slave_parameter %}
redir 301 {
redir 301 {
...
@@ -173,6 +171,7 @@
...
@@ -173,6 +171,7 @@
{% endif -%}
{% endif -%}
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