gitlab: Import gitlab-ce & gitlab-shell configs from omnibus-gitlab
authorKirill Smelkov <>
Thu, 7 Jan 2016 14:17:31 +0000 (17:17 +0300)
committerKirill Smelkov <>
Sun, 17 Jan 2016 21:39:27 +0000 (00:39 +0300)
gitlab: Import gitlab-ce & gitlab-shell configs from omnibus-gitlab

Pristine import of template configuration files from omnibus GitLab
package. All files were imported as-is in their ERB form and filenames
from omnibus-gitlab 8.2.3+ce.0-0-g8eda093 from here:

We will convert the templates to jinja2 and adjust them to slapos
version in the following patches.

Scheme for synchronizing with future upstream changes is envisioned as this:

    - checkout latest commit which updated pristine erb files
    - copy updated files from omnibus-gitlab, and commit the updates
    - checkout slapos master
    - merge commit that updated erb

That should reasonably work with not too-many conflicts and even those
should be not hard to resolve (with `git mergetool` e.g. in kdiff3)

/cc @kazuhiko, @jerome
software/gitlab/template/database.yml.erb [new file with mode: 0644]
software/gitlab/template/ [new file with mode: 0644]
software/gitlab/template/gitlab-shell-config.yml.erb [new file with mode: 0644]
software/gitlab/template/gitlab.yml.erb [new file with mode: 0644]
software/gitlab/template/rack_attack.rb.erb [new file with mode: 0644]
software/gitlab/template/resque.yml.erb [new file with mode: 0644]
software/gitlab/template/smtp_settings.rb.erb [new file with mode: 0644]
software/gitlab/template/unicorn.rb.erb [new file with mode: 0644]