Commit 01196ecb authored by eteri's avatar eteri

caddy: use slapos.cookbook:wrapper instead of template

parent 3cf3b04b
...@@ -28,12 +28,10 @@ log = $${:var}/log ...@@ -28,12 +28,10 @@ log = $${:var}/log
# caddy service # caddy service
################################# #################################
[caddy-service] [caddy-service]
recipe = slapos.recipe.template recipe = slapos.cookbook:wrapper
url = ${template-caddy-service:output} command-line = ${caddy:output} -conf $${caddy-configuration:output}
output = $${directory:service}/caddy wrapper-path = $${directory:service}/caddy
mode = 0700 output = $${:wrapper-path}
virtual-depends =
$${caddy-configuration:ipv6}
[caddy-configuration] [caddy-configuration]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
extends = extends =
../../component/caddy/buildout.cfg ../../component/caddy/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
../../component/dash/buildout.cfg
parts = parts =
golang19 golang19
slapos-cookbook slapos-cookbook
instance-profile instance-profile
template-caddy-service
template-caddy template-caddy
caddy caddy
...@@ -25,13 +23,6 @@ directory = ${buildout:directory}/go.work ...@@ -25,13 +23,6 @@ directory = ${buildout:directory}/go.work
src = ${:directory}/src src = ${:directory}/src
bin = ${:directory}/bin bin = ${:directory}/bin
[template-caddy-service]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-caddy-service.sh.in
md5sum = 3723cc727fbbe28627a4cf8482f4dded
output = ${buildout:directory}/template-caddy-service.sh.in
mode = 0644
[template-caddyfile] [template-caddyfile]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/Caddyfile.in url = ${:_profile_base_location_}/Caddyfile.in
...@@ -42,7 +33,7 @@ mode = 0644 ...@@ -42,7 +33,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 = 42ec4ee2b67fe8aaa4db4be468624ea2 md5sum = 045022e5698badca5dbdd6b95518f8e1
output = ${buildout:directory}/instance-caddy.cfg.in output = ${buildout:directory}/instance-caddy.cfg.in
mode = 0644 mode = 0644
......
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