X Stub gitconfig ; needs fixing in gitlab-workhorse

software/gitlab/TODO

@@ -3,8 +3,6 @@
 - setup basic ~/.gitconfig
 - pull request with 1 patch -> merge fast-forward
 
-- default project limit setting: 10 -> 50
-
 - integrate git-backup in a PBS-style way
 
 

software/gitlab/gitlab-parameters.cfg

@@ -75,18 +75,13 @@ configuration.sidekiq_shutdown_timeout  = 4
 configuration.unicorn_worker_timeout    = 60
 configuration.unicorn_worker_processes  = 2
 
-
 # unicorn advanced
-#configuration.unicorn_tcp_nopush        = true         not used
 configuration.unicorn_backlog_socket    = 1024
 
+
 # nginx
 configuration.nginx_client_max_body_size    = 250m
 configuration.nginx_redirect_http_to_https  = false
-# TODO -> generate certificate automatically
-# nginx['ssl_certificate'] = "/etc/gitlab/ssl/#{node['fqdn']}.crt"
-# nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/#{node['fqdn']}.key"
-# nginx['ssl_client_certificate'] = "/etc/gitlab/ssl/ca.crt" # Most root CA's are included by default
 
 # we don't need - we talk directly to frontend only
 configuration.nginx_ssl_ciphers             = ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4

software/gitlab/instance-gitlab.cfg.in

@@ -19,6 +19,8 @@ parts =
 
 # TODO gitlab-shell - since compiled shell picks up /usr/bin/env ruby ... ?
 
+    gitconfig
+
     gitlab-work
     gitlab-shell-work
 
@@ -109,7 +111,7 @@ promise = ${:etc}/promise
 
 # gitlab: etc/ log/ ...
 # TODO var/run/ (for *.pid .lock) ?
-[gitlab]
+[gitlab-dir]
 recipe  = slapos.cookbook:mkdirectory
 etc     = ${directory:etc}/gitlab
 log     = ${directory:log}/gitlab
@@ -118,9 +120,27 @@ var     = ${directory:var}/gitlab
 tmp     = ${:var}/tmp
 uploads = ${:var}/uploads
 assets  = ${:var}/assets
+backup  = ${directory:var}/backup
+
+[gitlab-repo-dir]
+recipe  = slapos.cookbook:mkdirectory
 repositories    = ${directory:var}/repositories
 # XXX goes away (?) satellites      = ${directory:var}/satellites
-backup  = ${directory:var}/backup
+
+# gitlab wants it to be drwxrws---
+# FIXME does not work for some reason, but probably it is not a blocker for
+#       gitlab to work ok
+mode    = 02770
+
+[gitlab]
+etc     = ${gitlab-dir:etc}
+log     = ${gitlab-dir:log}
+var     = ${gitlab-dir:var}
+tmp     = ${gitlab-dir:tmp}
+uploads = ${gitlab-dir:uploads}
+assets  = ${gitlab-dir:assets}
+backup  = ${gitlab-dir:backup}
+repositories = ${gitlab-repo-dir:repositories}
 
 
 # gitlab-shell: etc/ log/ gitlab_shell_secret ...
@@ -240,6 +260,15 @@ context-extra =
     section gitlab_workhorse        gitlab-workhorse
     section unicorn                 unicorn
 
+
+[gitconfig]
+<= etc-template
+template= {{ gitconfig_in }}
+
+# NOTE put directly into $HOME/ - this way git will pick it up
+rendered= ${directory:home}/.${:_buildout_section_name_}
+
+
 # TODO log: logrotate
 
 
@@ -249,9 +278,10 @@ context-extra =
 [gitlab-bin]
 recipe  = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/${:_buildout_section_name_}
+# NOTE HOME needed to pick gitconfig
 environment  =
     BUNDLE_GEMFILE = {{ gitlab_repository_location + '/Gemfile' }}
-#   HOME = ...  (needed ?)   better yes
+    HOME = ${directory:home}
 #   PATH = ...  TODO
     RAILS_ENV = production
 # XXX here vvv ?
@@ -446,8 +476,10 @@ command-line    = {{ gitlab_workhorse }}
 
 # XXX for git to be available on path
 # XXX for ruby to be available on path  (gitlab-workhorse -> gitlab-shell -> hooks  on push)
+# XXX for gitconfig to be pickable
 environment =
     PATH={{ git_location }}/bin:{{ ruby_location }}/bin:%(PATH)s
+    HOME=${directory:home}
 
 
 ######################

software/gitlab/instance.cfg.in

@@ -53,5 +53,7 @@ context =
     raw nginx_conf_in               ${nginx.conf.in:target}
     raw nginx_gitlab_http_conf_in   ${nginx-gitlab-http.conf.in:target}
 
+    raw gitconfig_in                ${gitconfig.in:target}
+
 # XXX hack - better use ${gitlab-shell-repository:location} directly
     raw gitlab_shell                ${gitlab-shell-repository:location}

software/gitlab/software.cfg

@@ -229,6 +229,10 @@ url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
 <= download-template
 # md5sum = TODO
 
+[gitconfig.in]
+<= download-template
+# md5sum = TODO
+
 
 [versions]
 rubygemsrecipe  = 0.2.2

software/gitlab/template/gitconfig.in

+{{ autogenerated }}
+# global git configuration for GitLab
+#
+{% from 'macrolib.cfg.in' import cfg  with context %}
+
+# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/attributes/default.rb
+
+# don't waste memory when packing (each thread uses own work memory)
+# besides it packs better with 1 thread
+[pack]
+        threads = 1
+
+# don't allow corrupt/broken objects to go in
+[receive]
+        fsckObjects = true
+
+
+
+# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb
+[user]
+        name = {{ cfg('email_display_name') }}
+        {# XXX email_from -> name@fqdn ? #}
+        email = {{ cfg('email_from') }}
+[core]
+        autocrlf = input
+

software/gitlab/template/gitlab.yml.in

@@ -19,8 +19,7 @@ production: &base
     port: {{ external_url.port or default_port[external_url.scheme] }}
     https: {{ cfg_https }}
 
-    # XXX temp workaround for gitlab not building correct url for host being ipv6 addr
-    url: {{ backend_info.url }}
+    url: {{ cfg('external_url') }}
 
 
     user: {{ backend_info.user }}