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
Dmitry Blinov
slapos
Commits
b7d86865
Commit
b7d86865
authored
Nov 03, 2017
by
Eteri
Committed by
Rafael Monnerat
Nov 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy: add enable-quic option
parent
918fd21f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
6 deletions
+31
-6
stack/caddy/buildout.cfg
stack/caddy/buildout.cfg
+9
-1
stack/caddy/instance-caddy.cfg.in
stack/caddy/instance-caddy.cfg.in
+13
-5
stack/caddy/template-caddy-service.sh.in
stack/caddy/template-caddy-service.sh.in
+9
-0
No files found.
stack/caddy/buildout.cfg
View file @
b7d86865
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
extends =
extends =
../../component/golang/buildout.cfg
../../component/golang/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
../../component/dash/buildout.cfg
gowork.cfg
gowork.cfg
parts =
parts =
...
@@ -34,7 +35,7 @@ mode = 0644
...
@@ -34,7 +35,7 @@ mode = 0644
[template-caddy]
[template-caddy]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-caddy.cfg.in
url = ${:_profile_base_location_}/instance-caddy.cfg.in
md5sum =
f87880908a33c03ba68f233cda6c6265
md5sum =
b684a143d5620e8ed89744ec8c7f079e
output = ${buildout:directory}/instance-caddy.cfg.in
output = ${buildout:directory}/instance-caddy.cfg.in
mode = 0644
mode = 0644
...
@@ -45,6 +46,13 @@ md5sum = b5794ac8b10ed90173ad566e6e324b35
...
@@ -45,6 +46,13 @@ md5sum = b5794ac8b10ed90173ad566e6e324b35
output = ${buildout:directory}/index.html
output = ${buildout:directory}/index.html
mode = 0644
mode = 0644
[template-caddy-service]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-caddy-service.sh.in
md5sum = d3562acaac05be570d28e37a0d889eec
output = ${buildout:directory}/template-caddy-service.sh.in
mode = 0644
[caddy]
[caddy]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
path = ${go_github.com_mholt_caddy:location}
path = ${go_github.com_mholt_caddy:location}
...
...
stack/caddy/instance-caddy.cfg.in
View file @
b7d86865
...
@@ -28,10 +28,17 @@ ca-dir = $${:srv}/ssl
...
@@ -28,10 +28,17 @@ ca-dir = $${:srv}/ssl
# caddy service
# caddy service
#################################
#################################
[caddy-service]
[caddy-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.recipe.template:jinja2
command-line = ${caddy:output} -conf $${caddy-configuration:rendered}
template = ${template-caddy-service:output}
wrapper-path = $${directory:service}/caddy
rendered = $${directory:service}/caddy
output = $${:wrapper-path}
mode = 0700
context =
key caddy_exec caddy-exec-dict:caddy-exec-file
section caddy_configuration_dict caddy-configuration
section parameter_dict slap-parameter
[caddy-exec-dict]
caddy-exec-file = ${caddy:output}
[caddy-configuration]
[caddy-configuration]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -117,3 +124,4 @@ key-content =
...
@@ -117,3 +124,4 @@ key-content =
cert-content =
cert-content =
caddy-ca-certificate =
caddy-ca-certificate =
port = 9443
port = 9443
enable-quic =
\ No newline at end of file
stack/caddy/template-caddy-service.sh.in
0 → 100644
View file @
b7d86865
#!${dash-output:dash}
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
{{ caddy_exec }} -conf {{caddy_configuration_dict['rendered']}}
{%- if parameter_dict['enable-quic'] != 'false' %}
-quic
{%- endif -%}
\ No newline at end of file
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