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
Kwabena Antwi-Boasiako
slapos
Commits
f968461b
Commit
f968461b
authored
Oct 11, 2017
by
Gabriel Monnerat
Committed by
eteri
Oct 20, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy: clean up
parent
e8bcdf2d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
25 deletions
+26
-25
component/caddy/buildout.cfg
component/caddy/buildout.cfg
+20
-0
software/caddy/instance.cfg.in
software/caddy/instance.cfg.in
+1
-1
software/caddy/software.cfg
software/caddy/software.cfg
+5
-24
No files found.
component/caddy/buildout.cfg
0 → 100644
View file @
f968461b
[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
software/caddy/instance.cfg.in
View file @
f968461b
#############################
#
# Deploy
hello-world
instance
# Deploy
caddy
instance
#
#############################
[buildout]
...
...
software/caddy/software.cfg
View file @
f968461b
[buildout]
extends =
../../component/golang/buildout.cfg
../../component/openssl/buildout.cfg
../../component/zlib/buildout.cfg
../../component/caddy/buildout.cfg
../../stack/slapos.cfg
parts =
golang19
slapos-cookbook
instance-profile
caddy-repository
caddy
[instance-profile]
...
...
@@ -17,7 +14,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in
rendered = ${buildout:directory}/instance.cfg
# MD5 checksum can be skipped for development (easier to develop), but must be filled for production
md5sum =
227ed080787c1b2d933c7c9f563017cb
md5sum =
ec3f3d81153f7b198ccf30c5a5bf532a
mode = 0644
extensions = jinja2.ext.do
context =
...
...
@@ -28,28 +25,12 @@ directory = ${buildout:directory}/go.work
src = ${:directory}/src
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]
recipe = slapos.recipe.cmmi
path = ${caddy-repository:location}
go = ${golang19:location}/bin/go
configure-command = :
make-binary = cd ${:path} && ${:go} install
make-targets =
make-targets = cd ${:path} && ${:go} get -v
make-binary = echo "START 1" && cd ${:path} && pwd && ${:go} get -v && echo "END"
environment =
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${golang19:location}/bin:${buildout:bin-directory}:%(PATH)s
GOPATH=${gopath:directory}
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