caddy: move files from software to stack

component/caddy/buildout.cfg

@@ -17,4 +17,5 @@ location = ${gopath:src}/${:go.importpath}
 [caddy-repository]
 <= go-git-repository
 go.importpath = github.com/mholt/caddy
-revision = c4dfbb9956095c92d0586a52723748c070c7b459
\ No newline at end of file
+revision = c4dfbb9956095c92d0586a52723748c070c7b459
+recursive = true
\ No newline at end of file

software/caddy/software.cfg

 [buildout]
 extends =
-  ../../component/caddy/buildout.cfg
-  ../../stack/slapos.cfg
-
-parts =
-  gowork
-  golang19
-  slapos-cookbook
-  instance-profile
-  template-caddy
-  caddy
-
-[gowork]
-install =
-  github.com/mholt/caddy/caddy
-
-[instance-profile]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ae83c35995ce14432ded78ca30cab61b
-output =${buildout:directory}/instance.cfg
-filename = instance.cfg
-mode = 0644
-
-[gopath]
-directory = ${buildout:directory}/go.work
-src	= ${:directory}/src
-bin	= ${:directory}/bin
-
-[template-caddyfile]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/Caddyfile.in
-md5sum = 616f9c7cb788e1f1d7cee2093a7dc6ef
-output = ${buildout:directory}/Caddyfile.in
-mode = 0644
-
-[template-caddy]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-caddy.cfg.in
-md5sum = 045022e5698badca5dbdd6b95518f8e1
-output = ${buildout:directory}/instance-caddy.cfg.in
-mode = 0644
-
-[template-public-html]
-recipe = slapos.recipe.template
-url =  ${:_profile_base_location_}/index.html
-md5sum = b5794ac8b10ed90173ad566e6e324b35
-output =  ${buildout:directory}/index.html
-mode = 0644
-
-[caddy]
-recipe  = slapos.recipe.cmmi
-path    = ${caddy-repository:location}
-go      = ${golang19:location}/bin/go
-#configure-command = cd ${:path}/caddy && ${:go} get -v
-make-targets =
-make-binary = cd ${:path}/caddy && ${:go} install -v
-environment =
-  PATH=${pkgconfig:location}/bin:${golang19:location}/bin:${buildout:bin-directory}:%(PATH)s
-  GOPATH=${gopath:directory}
-output =  ${gopath:bin}/caddy
\ No newline at end of file
+  ../../stack/caddy/buildout.cfg
\ No newline at end of file

stack/caddy/buildout.cfg

+[buildout]
+extends =
+  ../../component/caddy/buildout.cfg
+  ../../stack/slapos.cfg
+  gowork.cfg
+
+parts =
+  gowork
+  slapos-cookbook
+  instance-profile
+  template-caddy
+  caddy
+
+[gowork]
+install =
+  github.com/mholt/caddy
+  
+[instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+md5sum = ae83c35995ce14432ded78ca30cab61b
+output =${buildout:directory}/instance.cfg
+filename = instance.cfg
+mode = 0644
+
+[gopath]
+directory = ${buildout:directory}/go.work
+src	= ${:directory}/src
+bin	= ${:directory}/bin
+
+[template-caddyfile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/Caddyfile.in
+md5sum = 616f9c7cb788e1f1d7cee2093a7dc6ef
+output = ${buildout:directory}/Caddyfile.in
+mode = 0644
+
+[template-caddy]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-caddy.cfg.in
+md5sum = 045022e5698badca5dbdd6b95518f8e1
+output = ${buildout:directory}/instance-caddy.cfg.in
+mode = 0644
+
+[template-public-html]
+recipe = slapos.recipe.template
+url =  ${:_profile_base_location_}/index.html
+md5sum = b5794ac8b10ed90173ad566e6e324b35
+output =  ${buildout:directory}/index.html
+mode = 0644
+
+[caddy]
+recipe  = slapos.recipe.cmmi
+path    = ${caddy-repository:location}
+go      = ${gowork:golang}/bin/go
+configure-command = :
+make-targets =
+make-binary = cd ${:path}/caddy && ${:go} install -v
+environment =
+  PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
+  GOPATH=${gopath:directory}
+output =  ${gopath:bin}/caddy
\ No newline at end of file

stack/caddy/gowork.cfg

+# Code generated by gowork-snapshot; DO NOT EDIT.
+
+# list of go git repositories to fetch
+[gowork.goinstall]
+depends_gitfetch  =
+    ${go_github.com_mholt_caddy:recipe}
+
+
+[go_github.com_mholt_caddy]
+<= go-git-package
+go.importpath = github.com/mholt/caddy
+repository    = https://github.com/mholt/caddy.git
+revision  = v0.10.10-0-gc4dfbb9956