X get fetch works

software/gitlab/gitlab-parameters.cfg

@@ -10,7 +10,11 @@
 #   last updated for omnibus-gitlab 8.1.0+rc1.ce.0-24-g3021ed9
 #   TODO recheck )
 
+configuration.external_url              = http://lab.example.com
+
 # TODO move to proper place and merge related from omnibus
+# XXX https can be deduces from schema in external_url, at least not in
+#     separate frontend case
 configuration.https = false
 
 
@@ -21,6 +25,7 @@ configuration.rate_limit_period                 = 60
 configuration.initial_root_password     = password
 
 configuration.email_enabled             = true
+# XXX email_from is generated from external_url
 configuration.email_from                = lab@example.com
 configuration.email_display_name        = GitLab
 configuration.email_reply_to            = noreply@example.com

software/gitlab/instance-gitlab.cfg.in

@@ -16,6 +16,8 @@ parts =
     gitlab-{{ prog }}
 {% endfor %}
 
+# TODO gitlab-shell - since compiled shell picks up /usr/bin/env ruby ...
+
     gitlab-root-shadow
     gitlab-shell-root-shadow
 
@@ -57,6 +59,7 @@ configuration.unicorn_worker_processes  = {{ multiprocessing.cpu_count() + 1 }}
 configuration.nginx_worker_processes    = {{ multiprocessing.cpu_count() }}
 
 
+
 # for convenience
 [backend-info]
 host    = ${instance-parameter:ipv6-random}
@@ -162,6 +165,7 @@ context-extra =
     section gitlab                      gitlab
     section gitlab_shell                gitlab-shell
     section gitlab_shell_root_shadow    gitlab-shell-root-shadow
+    import  urlparse  urlparse
 
 [resque.yml]
 <= gitlab-etc-template
@@ -216,6 +220,7 @@ template= {{ nginx_gitlab_http_conf_in }}
 context-extra =
     section nginx                   nginx
     section gitlab_root_shadow      gitlab-root-shadow
+    section gitlab_workhorse        gitlab-workhorse
     section unicorn                 unicorn
 
 # TODO log: logrotate
@@ -409,19 +414,28 @@ port    = 0
 ########################
 #   gitlab-workhorse   #
 ########################
-[gitlab-workhorse]
+[gitlab-workhorse-dir]
 recipe  = slapos.cookbook:mkdirectory
 srv     = ${directory:srv}/gitlab-workhorse
 
+[gitlab-workhorse]
+srv     = ${gitlab-workhorse-dir:srv}
+socket  = ${gitlab-workhorse:srv}/gitlab-workhorse.socket
+
 # XXX -pprofListenAddr ?
 [service-gitlab-workhorse]
 recipe  = slapos.cookbook:wrapper
 wrapper-path    = ${directory:service}/gitlab-workhorse
 command-line    = {{ gitlab_workhorse }}
     -listenNetwork unix
-    -listenAddr ${gitlab-workhorse:srv}/gitlab-workhorse.socket
+    -listenAddr ${gitlab-workhorse:socket}
     -authSocket ${unicorn:socket}
 
+# XXX for git to be available on path
+# XXX -> more general place?
+environment =
+    PATH={{ git_location }}/bin:%(PATH)s
+
 
 ######################
 #   unicorn worker   #

software/gitlab/instance.cfg.in

@@ -33,6 +33,8 @@ context =
     raw bundler_4gitlab             ${bundler-4gitlab:bundle}
     raw gitlab_workhorse            ${gitlab-workhorse:location}/gitlab-workhorse
     raw git                         ${git:location}/bin/git
+# XXX git vs git_location
+    raw git_location                ${git:location}
     raw nginx_bin                   ${nginx-output:nginx}
     raw mime_types                  ${nginx-output:mime}
     raw postgresql_location         ${postgresql92:location}

software/gitlab/software.cfg

@@ -90,7 +90,8 @@ location = ${buildout:parts-directory}/gitlab
 repository = https://lab.nexedi.com/kirr/gitlab-shell.git
 # FIXME pin gitlab-shell version properly (wrt gitlab) ?
 #revision = v2.6.5-8-g6add33352316af566cec5d827981f1783c59b7f4
-branch = next
+#branch = next
+revision = 2ad30257
 location = ${buildout:parts-directory}/gitlab-shell
 
 [gitlab-workhorse-repository]

software/gitlab/template/gitlab.yml.in

@@ -14,8 +14,10 @@ production: &base
   ## GitLab settings
   gitlab:
     ## Web server settings (note: host is the FQDN, do not include http://)
-    host: {{ backend_info.host }}
-    port: {{ backend_info.port }}
+    {% set url = urlparse.urlparse(cfg('external_url')) %}
+    {% set default_port = {'http': 80, 'https': 443} %}
+    host: {{ url.hostname }}
+    port: {{ url.port or default_port[url.scheme] }}
     # TODO
     #https: <%= @gitlab_https %>
     https: false

software/gitlab/template/nginx-gitlab-http.conf.in

@@ -9,12 +9,8 @@ upstream gitlab {
   server unix:{{ unicorn.socket }} fail_timeout=0;
 }
 
-# TODO unix socket of gitlab-git-http-server
 upstream gitlab-git-http-server {
-  {# TODO reenable
-  server unix:<%= node['gitlab']['gitlab-git-http-server']['listen_addr'] %>;
-  #}
-  server unix:/dev/null fail_timeout=0;
+  server unix:{{ gitlab_workhorse.socket }};
 }
 
 {% if cfg_bool('https') and cfg_bool('nginx_redirect_http_to_https') %}