.

software/gitlab/build.sh

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

software/gitlab/instance-gitlab.cfg.in

@@ -70,10 +70,10 @@ configuration.default_projects_features.visibility_level= public
 
 configuration.webhook_timeout           = 10
 
-# XXX empty ok (gitlab substitutes its own default ?)
-# XXX or better explicitly make it 30 (omnibus default) ?
-# TODO -> remove
-configuration.satellites_timeout        =
+# # XXX empty ok (gitlab substitutes its own default ?)
+# # XXX or better explicitly make it 30 (omnibus default) ?
+# # TODO -> remove
+# configuration.satellites_timeout        =
 
 # 0 means forever (seconds)
 configuration.backup_keep_time          = 0

software/gitlab/instance.cfg.in

@@ -24,6 +24,7 @@ context =
     import os os
     import pwd pwd
     import urlparse urlparse
+    import multiprocessing multiprocessing
     key eggs_directory          buildout:eggs-directory
     key develop_eggs_directory  buildout:develop-eggs-directory
     key software_release_url    slap-connection:software-release-url

software/gitlab/template/gitlab.yml.in

@@ -81,11 +81,11 @@ production: &base
   # 3. Advanced settings
   # ==========================
 
-  ## GitLab Satellites
-  satellites:
-    # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
-    path:       ${gitlab:satellites}
-    timeout:    ${instance-parameter:configuration.satellites_timeout}
+  # ## GitLab Satellites
+  # satellites:
+  #   # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
+  #   path:       $ {gitlab:satellites}
+  #   timeout:    $ {instance-parameter:configuration.satellites_timeout}
 
   ## Backup settings
   backup: