.

software/gitlab/software.cfg

@@ -23,7 +23,7 @@ parts =
 
     gitlab-shell/vendor
     gitlab/vendor/bundle
-
+# TODO gitlab-git-http-server
 
 #   for instance
     instance.cfg
@@ -51,8 +51,8 @@ eggs    = ${ktest:egg}
 #   Software compilation   #
 ############################
 
-[rubygemsrecipe]
 # rubygemsrecipe with fixed url and this way pinned rubygems version
+[rubygemsrecipe]
 recipe  = rubygemsrecipe
 url     = https://rubygems.org/rubygems/rubygems-2.4.8.zip
 
@@ -87,21 +87,32 @@ environment =
 
 
 
-# gitlab & gitlab shell checked out as git repositories pinned to exact commit
-[gitlab-repository]
+# gitlab, gitlab-shell & gitlab-git-http-server checked out as git repositories
+# pinned to exact commit
+[git-repository]
 recipe  = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+
+[gitlab-repository]
+<= git-repository
 repository = https://gitlab.com/gitlab-org/gitlab-ce.git
-revision = v8.1.0-7-g6721215fa9713a620af4d8e8c096db8e93225548
+revision = v8.1.0-15-gb5391284007bb9d404de2bdc560cdd82ddae9688
 location = ${buildout:parts-directory}/gitlab
-git-executable = ${git:location}/bin/git
 
 [gitlab-shell-repository]
-recipe  = slapos.recipe.build:gitclone
+<= git-repository
 repository = https://gitlab.com/gitlab-org/gitlab-shell.git
 # FIXME pin gitlab-shell version properly (wrt gitlab) ?
 revision = v2.6.5-8-g6add33352316af566cec5d827981f1783c59b7f4
 location = ${buildout:parts-directory}/gitlab-shell
-git-executable = ${git:location}/bin/git
+
+[gitlab-git-http-server-repository]
+<= git-repository
+repository = https://gitlab.com/gitlab-org/gitlab-git-http-server.git
+# FIXME pin properly to what gitlab-ce wants
+revision = 0.3.0-2-g01f29889311a8ace8f795f55ca92aa08602ecad4
+location = ${buildout:parts-directory}/gitlab-git-http-server
+
 
 
 
@@ -136,6 +147,9 @@ make-targets= cd ${:path} &&
 
 
 
+# TODO build gitlab-git-http-server
+
+
 ###############################
 #   Trampoline for instance   #
 ###############################