gitlab: Hook gitlab- and gitlab-shell- configuration files into the system
authorKirill Smelkov <kirr@nexedi.com>
Thu, 7 Jan 2016 14:47:23 +0000 (17:47 +0300)
committerKirill Smelkov <kirr@nexedi.com>
Sun, 17 Jan 2016 21:39:27 +0000 (00:39 +0300)
commit13169cabd4cf602022be5a8d6447ce11528cc6c1
tree7219d6282eb26958e7cc5c5c17ed1f07ff150710
parent6fd7b9870aeeb9ad8ed7e2f0a1e6db8d6ea80746
gitlab: Hook gitlab- and gitlab-shell- configuration files into the system

- Download them on SR build and pass info to instance
- Instance prepares to process them as jinja2 templates
- Instance hooks the files into configuration location as appropriate

Every file so far is renamed *.erb -> *.in and a header added showing
that this file is autogenerated with links about what was the base
gitlab and/or omnibus version and omnibus reference revision this
template was last updated for.

So far all result configuration files are invalid - because ERB syntax
is there. We will convert the configuration files to proper jinja2
syntax and to using slapos parameters incrementally in the upcoming
patches.

NOTE (again): md5 sums are not yet fixed - we will fix them in the end
    of gitlab patches series after applying all tweaking changes.

/cc @kazuhiko, @jerome
12 files changed:
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance.cfg.in
software/gitlab/software.cfg
software/gitlab/template/config.ru.in [moved from software/gitlab/template/gitlab-rails-config.ru.erb with 65% similarity]
software/gitlab/template/database.yml.in [moved from software/gitlab/template/database.yml.erb with 62% similarity]
software/gitlab/template/gitlab-shell-config.yml.in [moved from software/gitlab/template/gitlab-shell-config.yml.erb with 86% similarity]
software/gitlab/template/gitlab.yml.in [moved from software/gitlab/template/gitlab.yml.erb with 98% similarity]
software/gitlab/template/rack_attack.rb.in [moved from software/gitlab/template/rack_attack.rb.erb with 77% similarity]
software/gitlab/template/resque.yml.erb [deleted file]
software/gitlab/template/resque.yml.in [new file with mode: 0644]
software/gitlab/template/smtp_settings.rb.in [moved from software/gitlab/template/smtp_settings.rb.erb with 65% similarity]
software/gitlab/template/unicorn.rb.in [moved from software/gitlab/template/unicorn.rb.erb with 72% similarity]