gitlab: version up and improve socket connecting

Shorten the socket path
Add a promise to check socket

software/gitlab/buildout.hash.cfg

@@ -54,7 +54,7 @@ md5sum = 0f1ec4077dab586cc003ae13f689eda2
 
 [instance-gitlab.cfg.in]
 _update_hash_filename_ = instance-gitlab.cfg.in
-md5sum = 0b023c7efd027f65b14e752484be2ec7
+md5sum = 0445e54ee7ce1f65ec79801e128c80d4
 
 [instance-gitlab-export.cfg.in]
 _update_hash_filename_ = instance-gitlab-export.cfg.in

software/gitlab/instance-gitlab.cfg.in

@@ -37,6 +37,7 @@ parts =
     logrotate-entry-cron
 
     on-reinstantiate
+    gitaly-socket-listening-promise
 
 # std stuff for slapos instance
 eggs-directory = {{ eggs_directory }}
@@ -174,12 +175,18 @@ internal = ${:sockets}/internal
 log     = ${directory:log}/gitaly
 
 [gitaly]
-socket  = ${gitaly-dir:sockets}/gitaly.socket
+socket  = ${directory:var}/gitaly.socket
 log     = ${gitaly-dir:log}
 location = {{ gitaly_location }}
 pid     = ${directory:run}/gitaly.pid
 internal_socket = ${gitaly-dir:internal}
 
+[gitaly-socket-listening-promise]
+<= monitor-promise-base
+promise = check_socket_listening
+name = gitaly_socket_listening_promise.py
+config-pathname = ${gitaly:socket}
+
 # 2. configuration files
 [etc-template]
 recipe  = slapos.recipe.template:jinja2
@@ -535,9 +542,9 @@ srv     = ${directory:srv}/gitlab-workhorse
 log     = ${directory:log}/workhorse
 
 [gitlab-workhorse]
-srv     = ${gitlab-workhorse-dir:srv}
-socket  = ${gitlab-workhorse:srv}/gitlab-workhorse.socket
-log     = ${gitlab-workhorse-dir:log}/gitlab-workhorse.log
+srv     = ${directory:srv}
+socket  = ${directory:srv}/gitlab-workhorse.socket
+log     = ${directory:log}/gitlab-workhorse.log
 secret  = ${secrets:secrets}/gitlab_workhorse_secret
 
 [service-gitlab-workhorse]
@@ -588,7 +595,7 @@ log     = ${directory:log}/unicorn
 [unicorn]
 srv     = ${unicorn-dir:srv}
 log     = ${unicorn-dir:log}
-socket  = ${:srv}/unicorn.socket
+socket  = ${directory:srv}/unicorn.socket
 
 [service-unicorn]
 recipe  = slapos.cookbook:wrapper

software/gitlab/software.cfg

@@ -135,7 +135,7 @@ git-executable = ${git:location}/bin/git
 <= git-repository
 repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
 # 9.5.10 + NXD patches:
-revision = v9.5.10-9-g69b0ffae00bf
+revision = v8.16.0.pre-16286-g9d66cd7b834
 location = ${buildout:parts-directory}/gitlab
 
 [gitlab-shell-repository]