Merge remote-tracking branch 'kirrlab/x/gitlab' into x/gitlab

* kirrlab/x/gitlab:
  .

software/gitlab/build.sh

@@ -7,8 +7,11 @@ partition_forinst() {
 }
 
 xslapos node software -v --only-sr `pwd`/software.cfg --pidfile $HOME/var/run/slapgrid-sr.pid   &&  \
-/bin/echo -ne '\n\n' && \
-xslapos node instance -v --only-cp `partition_forinst gitlab1` --pidfile $HOME/var/run/slapgrid-cp.pid
+true
+
+# /bin/echo -ne '\n\n' && \
+# xslapos node instance -v --only-cp `partition_forinst gitlab1` --pidfile $HOME/var/run/slapgrid-cp.pid
+
 
 #xslapos node software -v --only-sr `pwd`/../postgres/software.cfg --pidfile $HOME/var/run/slapgrid-sr.pid
 

software/gitlab/software.cfg

@@ -34,7 +34,7 @@ parts =
     database.yml.in
 
 
-#   gems
+    gems
 
     instance.cfg
 #   instance-gitlab.cfg
@@ -64,14 +64,21 @@ recipe  = zc.recipe.egg:scripts
 eggs    = ${ktest:egg}
 
 
-[gems]
+[rubygemsrecipe]
+# rubygemsrecipe with fixed url and 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 fluent-plugin-wendelin
+gems    = fluentd
 
 
 
@@ -81,14 +88,16 @@ gems    = fluentd fluent-plugin-wendelin
 #
 # TODO say how this bundler/gitlab differ from usual slapos installation
 [bundler-4gitlab]
-recipe  = rubygemsrecipe
+<= rubygemsrecipe
 ruby-location = ${ruby2.1:location}
 ruby-executable = ${:ruby-location}/bin/ruby
+# TODO pin bundler version
 gems    = bundler
 
 # bin installed here
 bundle  = ${buildout:bin-directory}/bundle
 
+
 # install together with dependencies of gitlab, which we cannot specify using
 #   --with-... gem option
 # ( reason: rubygemsrecipe hardcodes PATH inside generated bin/* and it is