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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Leymonerie
slapos
Commits
514cdaa5
Commit
514cdaa5
authored
Aug 29, 2019
by
Łukasz Nowak
Committed by
Łukasz Nowak
Aug 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Allow to configure request-timeout
It defaults to 600s, which is good reasonable chosen before.
parent
b32f7fa8
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
9 deletions
+18
-9
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+5
-5
software/caddy-frontend/instance-apache-frontend.cfg.in
software/caddy-frontend/instance-apache-frontend.cfg.in
+1
-0
software/caddy-frontend/instance-caddy-input-schema.json
software/caddy-frontend/instance-caddy-input-schema.json
+6
-0
software/caddy-frontend/instance.cfg.in
software/caddy-frontend/instance.cfg.in
+1
-0
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+1
-0
software/caddy-frontend/templates/cached-virtualhost.conf.in
software/caddy-frontend/templates/cached-virtualhost.conf.in
+2
-2
software/caddy-frontend/templates/default-virtualhost.conf.in
...ware/caddy-frontend/templates/default-virtualhost.conf.in
+2
-2
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
514cdaa5
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
4832bb055d31be6e99e2ef890b2206b0
md5sum =
d8ce8da7ea7d82c33958bdbabbaad956
[template-common]
[template-common]
filename = instance-common.cfg.in
filename = instance-common.cfg.in
...
@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
...
@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend]
[template-apache-frontend]
filename = instance-apache-frontend.cfg.in
filename = instance-apache-frontend.cfg.in
md5sum =
74f730a4fb079416118bd412a458cea8
md5sum =
451de43ff66ef58b989ac3ebd0d9280f
[template-caddy-replicate]
[template-caddy-replicate]
filename = instance-apache-replicate.cfg.in
filename = instance-apache-replicate.cfg.in
...
@@ -30,7 +30,7 @@ md5sum = 491a19d1747bbf795c27b094cf67114d
...
@@ -30,7 +30,7 @@ md5sum = 491a19d1747bbf795c27b094cf67114d
[template-slave-list]
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
13338a7844f5a4b749f6647ba8163a8d
md5sum =
c33df53e7752f43b89c5fda7e92a5a78
[template-slave-configuration]
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
filename = templates/custom-virtualhost.conf.in
...
@@ -54,11 +54,11 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
...
@@ -54,11 +54,11 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
[template-default-slave-virtualhost]
[template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in
filename = templates/default-virtualhost.conf.in
md5sum =
8198e3ad06a4d6c750d22d8cf854fa41
md5sum =
9a984febd7fa14a4ea94599f3e83139c
[template-cached-slave-virtualhost]
[template-cached-slave-virtualhost]
filename = templates/cached-virtualhost.conf.in
filename = templates/cached-virtualhost.conf.in
md5sum =
db68c015f1ac06d74f9373f6f846577d
md5sum =
a73839d777fbd548286bbeccf47be335
[template-log-access]
[template-log-access]
filename = templates/template-log-access.conf.in
filename = templates/template-log-access.conf.in
...
...
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @
514cdaa5
...
@@ -264,6 +264,7 @@ extra-context =
...
@@ -264,6 +264,7 @@ extra-context =
key enable_http2_by_default configuration:enable-http2-by-default
key enable_http2_by_default configuration:enable-http2-by-default
key global_disable_http2 configuration:global-disable-http2
key global_disable_http2 configuration:global-disable-http2
key ciphers configuration:ciphers
key ciphers configuration:ciphers
key request_timeout configuration:request-timeout
key proxy_try_duration configuration:proxy-try-duration
key proxy_try_duration configuration:proxy-try-duration
key proxy_try_interval configuration:proxy-try-interval
key proxy_try_interval configuration:proxy-try-interval
key access_log caddy-configuration:access-log
key access_log caddy-configuration:access-log
...
...
software/caddy-frontend/instance-caddy-input-schema.json
View file @
514cdaa5
...
@@ -107,6 +107,12 @@
...
@@ -107,6 +107,12 @@
"description"
:
"List of ciphers. Empty defaults to Caddy list of ciphers. See https://caddyserver.com/docs/tls for more information."
,
"description"
:
"List of ciphers. Empty defaults to Caddy list of ciphers. See https://caddyserver.com/docs/tls for more information."
,
"title"
:
"Ordered space separated list of ciphers"
,
"title"
:
"Ordered space separated list of ciphers"
,
"type"
:
"string"
"type"
:
"string"
},
"request-timeout"
:
{
"default"
:
600
,
"description"
:
"Timeout for HTTP requests."
,
"title"
:
"HTTP Request timeout in seconds"
,
"type"
:
"integer"
}
}
},
},
"title"
:
"Input Parameters"
,
"title"
:
"Input Parameters"
,
...
...
software/caddy-frontend/instance.cfg.in
View file @
514cdaa5
...
@@ -116,6 +116,7 @@ configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
...
@@ -116,6 +116,7 @@ configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
configuration.enable-http2-by-default = true
configuration.enable-http2-by-default = true
configuration.global-disable-http2 = false
configuration.global-disable-http2 = false
configuration.ciphers =
configuration.ciphers =
configuration.request-timeout = 600
configuration.enable-quic = false
configuration.enable-quic = false
configuration.mpm-graceful-shutdown-timeout = 5
configuration.mpm-graceful-shutdown-timeout = 5
configuration.monitor-httpd-port = 8072
configuration.monitor-httpd-port = 8072
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
514cdaa5
...
@@ -241,6 +241,7 @@ http_port = {{ dumps('' ~ http_port) }}
...
@@ -241,6 +241,7 @@ http_port = {{ dumps('' ~ http_port) }}
local_ipv4 = {{ dumps('' ~ local_ipv4) }}
local_ipv4 = {{ dumps('' ~ local_ipv4) }}
cached_port = {{ dumps('' ~ cached_port) }}
cached_port = {{ dumps('' ~ cached_port) }}
ssl_cached_port = {{ ('' ~ ssl_cached_port) }}
ssl_cached_port = {{ ('' ~ ssl_cached_port) }}
request_timeout = {{ ('' ~ request_timeout) }}
{# BBB: apache_custom_https and apache_custom_http #}
{# BBB: apache_custom_https and apache_custom_http #}
{% set caddy_custom_http_template = slave_instance.pop('caddy_custom_http', slave_instance.pop('apache_custom_http', '')) %}
{% set caddy_custom_http_template = slave_instance.pop('caddy_custom_http', slave_instance.pop('apache_custom_http', '')) %}
{% set caddy_custom_https_template = slave_instance.pop('caddy_custom_https', slave_instance.pop('apache_custom_https', '')) %}
{% set caddy_custom_https_template = slave_instance.pop('caddy_custom_https', slave_instance.pop('apache_custom_https', '')) %}
...
...
software/caddy-frontend/templates/cached-virtualhost.conf.in
View file @
514cdaa5
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
try_interval {{ slave_parameter['proxy_try_interval'] }}ms
try_interval {{ slave_parameter['proxy_try_interval'] }}ms
transparent
transparent
timeout
600
s
timeout
{{ slave_parameter['request_timeout'] }}
s
{%- if ssl_proxy_verify %}
{%- if ssl_proxy_verify %}
{%- if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
{%- if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
try_duration {{ slave_parameter['proxy_try_duration'] }}s
try_duration {{ slave_parameter['proxy_try_duration'] }}s
try_interval {{ slave_parameter['proxy_try_interval'] }}ms
try_interval {{ slave_parameter['proxy_try_interval'] }}ms
transparent
transparent
timeout
600
s
timeout
{{ slave_parameter['request_timeout'] }}
s
{%- if ssl_proxy_verify %}
{%- if ssl_proxy_verify %}
{%- if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
{%- if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
...
...
software/caddy-frontend/templates/default-virtualhost.conf.in
View file @
514cdaa5
...
@@ -122,7 +122,7 @@
...
@@ -122,7 +122,7 @@
header_upstream -Pragma
header_upstream -Pragma
{%- endif %} {#- if disable_no_cache_header #}
{%- endif %} {#- if disable_no_cache_header #}
transparent
transparent
timeout
600
s
timeout
{{ slave_parameter['request_timeout'] }}
s
{%- if ssl_proxy_verify %}
{%- if ssl_proxy_verify %}
{%- if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
{%- if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
header_upstream -Pragma
header_upstream -Pragma
{%- endif %} {#- if disable_no_cache_header #}
{%- endif %} {#- if disable_no_cache_header #}
transparent
transparent
timeout
600
s
timeout
{{ slave_parameter['request_timeout'] }}
s
{%- if ssl_proxy_verify %}
{%- if ssl_proxy_verify %}
{%- if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
{%- if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
...
...
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