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
586f076c
Commit
586f076c
authored
Oct 20, 2017
by
eteri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy: use slapos.cookbook:wrapper instead of template
parent
68b4afdf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
16 deletions
+5
-16
software/caddy/instance-caddy.cfg.in
software/caddy/instance-caddy.cfg.in
+4
-6
software/caddy/software.cfg
software/caddy/software.cfg
+1
-10
No files found.
software/caddy/instance-caddy.cfg.in
View file @
586f076c
...
@@ -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
...
...
software/caddy/software.cfg
View file @
586f076c
...
@@ -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
...
...
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