.

software/gitlab/README.txt

+GitLab
+======
+
+:abstract: GitLab software release is used to deploy GitLab intances together
+    with accompanying PostgreSQL and Redis and to request ipv4 frontend.
+
+
+TODO ...
+

software/gitlab/instance-gitlab.cfg.in

@@ -61,6 +61,16 @@ 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) ?
+configuration.satellites_timeout        =
+
+# 0 means forever (seconds)
+configuration.backup_keep_time          = 0
+
+# NOTE empty = default gitlab limits
+configuration.git_max_size              =
+configuration.git_timeout               =
 
 
 
@@ -73,6 +83,10 @@ url     = http://[${:host}]:${:port}
 # current slapuserX
 user    = {{ pwd.getpwuid(os.getuid())[0] }}
 
+# XXX hack
+gitlab-shell    = {{ gitlab_shell }}
+git             = {{ git }}
+
 
 [publish-instance-info]
 recipe  = slapos.cookbook:publish
@@ -112,6 +126,7 @@ bin     = ${:home}/bin
 etc     = ${:home}/etc
 var     = ${:home}/var
 log     = ${:var}/log
+srv     = ${:home}/srv
 # slapos startup/service/promies scripts live here:
 startup = ${:etc}/run
 service = ${:etc}/service
@@ -125,6 +140,9 @@ log     = ${directory:log}/gitlab
 var     = ${directory:var}/gitlab
 tmp     = ${:var}/tmp
 uploads = ${:var}/uploads
+repositories    = ${directory:srv}/repositories
+satellites      = ${directory:srv}/satellites
+backup  = ${directory:srv}/backup
 
 
 # gitlab-shell: etc/

software/gitlab/instance.cfg.in

@@ -30,6 +30,9 @@ context =
     raw resque_yml_in               ${resque.yml.in:target}
     raw smtp_settings_rb_in         ${smtp_settings.rb.in:target}
 
+# XXX hack - better use ${gitlab-shell-repository:location} directly
+    raw gitlab_shell                ${gitlab-shell-repository:location}
+
 
 [switch-softwaretype] 
 recipe = slapos.cookbook:softwaretype

software/gitlab/template/gitlab.yml.in

@@ -2,6 +2,7 @@
 # see:
 # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example
 # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+# (last updated for v7.13.0.rc2)
 
 production: &base
   #
@@ -51,9 +52,93 @@ production: &base
     # repository_downloads_path: ...
 
 
+  ## Gravatar
+  gravatar:
+    enabled: true
+    # TODO
+    # plain_url: ...
+    # ssl_url:   ...
+
+
+  #
+  # 2. Auth settings
+  # ==========================
+
+  ## LDAP disabled
+  ldap:
+    enabled: false
+
+  ## OmniAuth disabled (TODO ?)
+  omniauth:
+    enabled: false
+
+
+  #
+  # 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}
+
+  ## Backup settings
+  backup:
+    path:       ${gitlab:backup}
+    keep_time:  ${instance-parameter:configuration.backup_keep_time}
+    upload:
+      # TODO ?
+      # connection: ...
+      # remote_directory: ...
+      # multipart_chunk_size: ...
+
+
+  ## GitLab Shell settings
+  gitlab_shell:
+    path:   ${gitlab-backend:gitlab-shell}
+
+    repos_path: ${gitlab:repositories}
+    hooks_path: ${gitlab-backend:gitlab-shell}/hooks/
+
+    # Git over HTTP is enabled
+    upload_pack:    true
+    receive_pack:   true
+
+    # Git over SSH is disabled elsewhere (so we don't care about ssh_port)
+    #ssh_port: ...
+
+
+  ## Git settings
+  git:
+    bin_path:   ${gitlab-backend:git}
+    max_size:   ${instance-parameter:configuration.git_max_size}
+    timeout:    ${instance-parameter:configuration.git_timeout}
+
+
+  #
+  # 4. Extra customization
+  # ==========================
+
+  extra:
+    # google_analytics_id: ...
+    # piwik_url: ...
+    # piwik_site_id: ...
+
+    # TODO
+    # <% if @extra_sign_in_text %>
+    # ## Text under sign-in page (Markdown enabled)
+    # sign_in_text: |
+    # <% @extra_sign_in_text.to_s.split("\n").each do |line| %>
+    #   <%= line %>
+    # <% end %>
+    # <% end %>
+
+    # TODO
+    # rack_attack:
+    #   git_basic_auth: ...
 
-  # # no rack-attack enabled
-  # rack_attack:
-  #   git_basic_auth:
 
-# TODO
+# (for testing on-field maybe)
+development:
+  <<: *base