Commit 6d7df7d6 authored by Gabriel Monnerat's avatar Gabriel Monnerat Committed by eteri

caddy: clean up

parent efe54803
[buildout]
extends =
../../component/golang/buildout.cfg
parts +=
caddy-repository
[git-repository]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
[go-git-repository]
<= git-repository
repository = https://${:go.importpath}.git
location = ${gopath:src}/${:go.importpath}
[caddy-repository]
<= go-git-repository
go.importpath = github.com/mholt/caddy
revision = c4dfbb9956095c92d0586a52723748c070c7b459
\ No newline at end of file
############################# #############################
# #
# Deploy hello-world instance # Deploy caddy instance
# #
############################# #############################
[buildout] [buildout]
......
[buildout] [buildout]
extends = extends =
../../component/golang/buildout.cfg ../../component/caddy/buildout.cfg
../../component/openssl/buildout.cfg
../../component/zlib/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
parts = parts =
golang19 golang19
slapos-cookbook slapos-cookbook
instance-profile instance-profile
caddy-repository
caddy caddy
[instance-profile] [instance-profile]
...@@ -17,7 +14,7 @@ recipe = slapos.recipe.template:jinja2 ...@@ -17,7 +14,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
rendered = ${buildout:directory}/instance.cfg rendered = ${buildout:directory}/instance.cfg
# MD5 checksum can be skipped for development (easier to develop), but must be filled for production # MD5 checksum can be skipped for development (easier to develop), but must be filled for production
md5sum = 227ed080787c1b2d933c7c9f563017cb md5sum = ec3f3d81153f7b198ccf30c5a5bf532a
mode = 0644 mode = 0644
extensions = jinja2.ext.do extensions = jinja2.ext.do
context = context =
...@@ -28,28 +25,12 @@ directory = ${buildout:directory}/go.work ...@@ -28,28 +25,12 @@ directory = ${buildout:directory}/go.work
src = ${:directory}/src src = ${:directory}/src
bin = ${:directory}/bin bin = ${:directory}/bin
[git-repository]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
[go-git-repository]
<= git-repository
repository = https://${:go.importpath}.git
location = ${gopath:src}/${:go.importpath}
[caddy-repository]
<= go-git-repository
go.importpath = github.com/mholt/caddy
revision = c4dfbb9956095c92d0586a52723748c070c7b459
[caddy] [caddy]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
path = ${caddy-repository:location} path = ${caddy-repository:location}
go = ${golang19:location}/bin/go go = ${golang19:location}/bin/go
configure-command = : make-targets = cd ${:path} && ${:go} get -v
make-binary = cd ${:path} && ${:go} install make-binary = echo "START 1" && cd ${:path} && pwd && ${:go} get -v && echo "END"
make-targets =
environment = environment =
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${golang19:location}/bin:${buildout:bin-directory}:%(PATH)s PATH=${pkgconfig:location}/bin:${golang19:location}/bin:${buildout:bin-directory}:%(PATH)s
GOPATH=${gopath:directory} GOPATH=${gopath:directory}
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