X software.cfg cleanup

software/gitlab/instance-nginx.cfg.in

 # TODO nginx instance
+# XXX is it a good idea to split nginx into separate instance?

software/gitlab/software.cfg

@@ -10,54 +10,33 @@ extends =
     ../../component/nodejs/buildout.cfg
     ../../component/nginx/buildout.cfg
 
-
 parts =
     python2.7
     ruby2.1
     git
+# TODO pg-version ?
     postgresql
     cmake
     icu
     pkgconfig
-
-# TODO becomes autodependency
-    nodejs
-
-
-    ktestbin
-
-# TODO becomes autodependency
-#   bundler-4gitlab
+    nginx-output
 
     gitlab-shell/vendor
     gitlab/vendor/bundle
 
-    database.yml.in
-
-
-    gems
-
-# nginx
-    nginx-output
-    nginx.conf.in
 
+#   for instance
     instance.cfg
-#   instance-gitlab.cfg
 
-#   for instance
     slapos-cookbook-develop
     slapos-cookbook
     eggs
 
-#extends = https://lab.nexedi.com/kirr/slapos/raw/master/software/helloworld/software.cfg
-
-
-# eggs for instance.cfg
-[eggs]
-recipe  = zc.recipe.egg
-eggs    = plone.recipe.command
 
+    ktestbin
 
+# XXX ktest is still here to show how to rework bin/ .py generation in helloworld/
+# TODO remove ktest
 [ktest]
 recipe  = zc.recipe.egg:develop
 egg     = ktest
@@ -68,24 +47,16 @@ recipe  = zc.recipe.egg:scripts
 eggs    = ${ktest:egg}
 
 
+############################
+#   Software compilation   #
+############################
+
 [rubygemsrecipe]
-# rubygemsrecipe with fixed url and pinned rubygems version
+# rubygemsrecipe with fixed url and this way pinned rubygems version
 recipe  = rubygemsrecipe
 url     = https://rubygems.org/rubygems/rubygems-2.4.8.zip
 
 
-[gems]
-<= rubygemsrecipe
-ruby-executable = ${ruby2.1:location}/bin/ruby
-
-# XXX vvv does not work
-# location= ${buildout:gems-directory}
-
-#gems    = fluentd fluent-plugin-wendelin
-gems    = fluentd
-
-
-
 # bundler, that we'll use to
 # - install gems for gitlab
 # - run gitlab services / jobs  (via `bundle exec ...`)
@@ -95,8 +66,7 @@ gems    = fluentd
 <= rubygemsrecipe
 ruby-location = ${ruby2.1:location}
 ruby-executable = ${:ruby-location}/bin/ruby
-# TODO pin bundler version
-gems    = bundler
+gems    = bundler==1.10.6
 
 # bin installed here
 bundle  = ${buildout:bin-directory}/bundle
@@ -117,8 +87,6 @@ environment =
 
 
 
-
-
 # gitlab & gitlab shell checked out as git repositories pinned to exact commit
 [gitlab-repository]
 recipe  = slapos.recipe.build:gitclone
@@ -168,13 +136,21 @@ make-targets= cd ${:path} &&
 
 
 
+###############################
+#   Trampoline for instance   #
+###############################
+
+# eggs for instance.cfg
+[eggs]
+recipe  = zc.recipe.egg
+eggs    = plone.recipe.command
+
 
-# TODO move recipe/url/output to common
 [instance.cfg]
 recipe  = slapos.recipe.template
 url     = ${:_profile_base_location_}/instance.cfg.in
 output  = ${buildout:directory}/instance.cfg
-# TODO md5
+# md5sum = TODO
 
 
 # macro: download a file named as section name
@@ -193,15 +169,13 @@ destination = ${buildout:directory}/${:_buildout_section_name_}
 url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
 
 
-
 [instance-gitlab.cfg.in]
 <= download-file
-# TODO md5
+# md5sum = TODO
 
-# XXX is it a good idea to split nginx into separate instance?
 [instance-nginx.cfg.in]
 <= download-file
-# TODO md5
+# md5sum = TODO
 
 
 [database.yml.in]
@@ -220,16 +194,18 @@ url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
 <= download-template
 # md5sum = TODO
 
+[unicorn.rb.in]
+<= download-template
+# md5sum = TODO
 
 [nginx.conf.in]
 <= download-template
-# TODO md5
-
-
+# md5sum = TODO
 
+[nginx-gitlab-http.conf.in]
+<= download-template
+# md5sum = TODO
 
-# [buildout]
-# gems-directory  = gemsAAA   # XXX = good idea?
 
 [versions]
 rubygemsrecipe  = 0.2.2