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
Matevz Golob
slapos
Commits
11b99cd4
Commit
11b99cd4
authored
Oct 24, 2017
by
Eteri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy: remove useless configuration
parent
bcd1612a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
30 deletions
+4
-30
component/caddy/buildout.cfg
component/caddy/buildout.cfg
+0
-21
stack/caddy/buildout.cfg
stack/caddy/buildout.cfg
+4
-9
No files found.
component/caddy/buildout.cfg
deleted
100644 → 0
View file @
bcd1612a
[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
recursive = true
\ No newline at end of file
stack/caddy/buildout.cfg
View file @
11b99cd4
[buildout]
[buildout]
extends =
extends =
../../component/
caddy
/buildout.cfg
../../component/
golang
/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
gowork.cfg
gowork.cfg
...
@@ -23,11 +23,6 @@ output =${buildout:directory}/instance.cfg
...
@@ -23,11 +23,6 @@ output =${buildout:directory}/instance.cfg
filename = instance.cfg
filename = instance.cfg
mode = 0644
mode = 0644
[gopath]
directory = ${buildout:directory}/go.work
src = ${:directory}/src
bin = ${:directory}/bin
[template-caddyfile]
[template-caddyfile]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/Caddyfile.in
url = ${:_profile_base_location_}/Caddyfile.in
...
@@ -51,12 +46,12 @@ mode = 0644
...
@@ -51,12 +46,12 @@ mode = 0644
[caddy]
[caddy]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
path = ${
caddy-repositor
y:location}
path = ${
go_github.com_mholt_cadd
y:location}
go = ${gowork:golang}/bin/go
go = ${gowork:golang}/bin/go
configure-command = :
configure-command = :
make-targets =
make-targets =
make-binary = cd ${:path}/caddy && ${:go} install -v
make-binary = cd ${:path}/caddy && ${:go} install -v
environment =
environment =
PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
GOPATH=${gopath:directory}
GOPATH=${gowork:directory}
output = ${gopath:bin}/caddy
output = ${gowork:bin}/caddy
\ No newline at end of file
\ 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