diff --git a/software/gitlab/software.cfg b/software/gitlab/software.cfg index aa79a7fb80418f3766c45f0ae0dfc143c48c89c5..c6b237e868a9c27baa3e5b41e68ee8f47358a59c 100644 --- a/software/gitlab/software.cfg +++ b/software/gitlab/software.cfg @@ -223,15 +223,15 @@ url = ${:_profile_base_location_}/template/${:_buildout_section_name_} [config.ru.in] <= download-template -md5sum = 91737a2067be80f3ae48157e5a0738b4 +md5sum = 4f6191c6e6bbaf2cd39c6f155fe192e1 [database.yml.in] <= download-template -md5sum = 76d8f20532d63282ecd3617a3937fcf1 +md5sum = 60504181bf40fefd023b2b8facff291d [gitconfig.in] <= download-template -md5sum = d8b3611386c4982605edd9a31832ee28 +md5sum = 56b135596e013c02bda5555dda6b376b [gitlab-parameters.cfg] <= download-file @@ -239,7 +239,7 @@ md5sum = b04b72949f0b9b5da96870ffbf8c1ff4 [gitlab-shell-config.yml.in] <= download-template -md5sum = 9c62aa1bf7396f207a528e39973aa135 +md5sum = cdcb2036c33da547a2cf5d0515cf48ff [gitlab-unicorn-startup.in] <= download-file @@ -247,7 +247,7 @@ md5sum = 14c5632182d830c03f7788c85d6f4da1 [gitlab.yml.in] <= download-template -md5sum = 8f1c52ed223ee2c2d07c6c79bcd2f6c0 +md5sum = 043804b76affe91a0bd3686f93f80ac8 [instance-gitlab.cfg.in] <= download-file @@ -259,27 +259,27 @@ md5sum = a56a44e96f65f5ed20211bb6a54279f4 [nginx-gitlab-http.conf.in] <= download-template -md5sum = be7ddd26b0b0196fde8d699e50e84b2f +md5sum = 27feb252c2eba8e665164ea3b496fcd7 [nginx.conf.in] <= download-template -md5sum = 71b4221cd91e0e1e20a72b97991f2665 +md5sum = 5799afef0a60d07c9e6b52d0efaccec7 [rack_attack.rb.in] <= download-template -md5sum = 2cf56b210a906cee80f86cde7112f468 +md5sum = 6218a2f01fea29da1f61d69584635b52 [resque.yml.in] <= download-template -md5sum = 1fa21655a845602f68a901f23a1da89a +md5sum = acd686b43ae37c4282e67b668786986e [smtp_settings.rb.in] <= download-template -md5sum = 07b640122b8c4840e853360f2479d0ac +md5sum = a4dda9c94f2ee72851343f505d5f495e [unicorn.rb.in] <= download-template -md5sum = 4f7c14147fd60b4cc9aefe7f64524abe +md5sum = 293143fecab603299bbc0a3dfd907ac3 [versions] diff --git a/software/gitlab/template/config.ru.in b/software/gitlab/template/config.ru.in index d5bcf51fa5a0a55011d36125db230fae456b8b8d..658b75658e80b90ace64b31b008ae1ae4150bbfc 100644 --- a/software/gitlab/template/config.ru.in +++ b/software/gitlab/template/config.ru.in @@ -2,7 +2,7 @@ # see: # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config.ru # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab-rails-config.ru.erb -# (last updated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) # This file is used by Rack-based servers to start the application. diff --git a/software/gitlab/template/database.yml.in b/software/gitlab/template/database.yml.in index d11cc251374a80bbf3554713c8b2cee5564ca500..b1a5f92db4f5ac75e3f85e510ca2ae33453545c9 100644 --- a/software/gitlab/template/database.yml.in +++ b/software/gitlab/template/database.yml.in @@ -2,7 +2,7 @@ # see: # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.postgresql # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb -# (last updated for 8.5.1+ce.0-1-ge732b39) +# (last updated for 8.6.5+ce.0-0-g342f8be) {% from 'macrolib.cfg.in' import cfg with context %} diff --git a/software/gitlab/template/gitconfig.in b/software/gitlab/template/gitconfig.in index cb3000952eed232a9b8fb91b3b244a0468ba2ba2..4826c56b4ea8b2dd1583d44b69cea72cb49fa864 100644 --- a/software/gitlab/template/gitconfig.in +++ b/software/gitlab/template/gitconfig.in @@ -3,7 +3,7 @@ # see: # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/attributes/default.rb # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb -# (last updated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) # {% from 'macrolib.cfg.in' import cfg with context %} diff --git a/software/gitlab/template/gitlab-shell-config.yml.in b/software/gitlab/template/gitlab-shell-config.yml.in index 76726c29f7bb54b8f0156dfd75b3ac0e57ae8c3c..e37f34e8ee04faf04b367ad38ceba219dd5bbd09 100644 --- a/software/gitlab/template/gitlab-shell-config.yml.in +++ b/software/gitlab/template/gitlab-shell-config.yml.in @@ -2,7 +2,7 @@ # see: # https://gitlab.com/gitlab-org/gitlab-shell/blob/master/config.yml.example # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb -# (last updated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) # GitLab user. git by default user: {{ backend_info.user }} diff --git a/software/gitlab/template/gitlab.yml.in b/software/gitlab/template/gitlab.yml.in index 61f0ae19a35a1cf888c1622b0c06a1f5d33e9be7..1468240b436079922770ff58e70a930afebcfff9 100644 --- a/software/gitlab/template/gitlab.yml.in +++ b/software/gitlab/template/gitlab.yml.in @@ -2,7 +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 omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) {% from 'macrolib.cfg.in' import cfg, cfg_https, external_url with context %} diff --git a/software/gitlab/template/nginx-gitlab-http.conf.in b/software/gitlab/template/nginx-gitlab-http.conf.in index f16f9ea126d8283bfefd0110cd252b628bcb0018..cdd186bebb4f510e46f4741702394dc5ec7f0f34 100644 --- a/software/gitlab/template/nginx-gitlab-http.conf.in +++ b/software/gitlab/template/nginx-gitlab-http.conf.in @@ -1,7 +1,7 @@ {{ autogenerated }} # see: # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb -# (last updated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) {% from 'macrolib.cfg.in' import cfg, cfg_bool, cfg_https, fqdn with context %} diff --git a/software/gitlab/template/nginx.conf.in b/software/gitlab/template/nginx.conf.in index 620d59de1c0d384523a3f745fa38b91e2561e8ac..8c384da87b9f0ab8cd6f3f9304fd257beea20c15 100644 --- a/software/gitlab/template/nginx.conf.in +++ b/software/gitlab/template/nginx.conf.in @@ -2,7 +2,7 @@ # see: # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab-ssl # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb -# (last updated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) {% from 'macrolib.cfg.in' import cfg with context %} @@ -41,8 +41,12 @@ http { include {{ nginx_mime_types }}; + {# we do not do nginx caching: + - gitlab-workhorse serves raw blobs fast + - we have caches on frontend nodes proxy_cache_path <%= @proxy_cache_path %>; proxy_cache <%= @proxy_cache %>; + #} include {{ nginx_gitlab_http_conf }}; diff --git a/software/gitlab/template/rack_attack.rb.in b/software/gitlab/template/rack_attack.rb.in index ecec55b3e348160e9c84c191778950f7737c900f..7773596277d0c3bf0d3dfc9937974fc7feb49281 100644 --- a/software/gitlab/template/rack_attack.rb.in +++ b/software/gitlab/template/rack_attack.rb.in @@ -2,7 +2,7 @@ # see: # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/rack_attack.rb.example # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/rack_attack.rb.erb -# (last updated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) {% from 'macrolib.cfg.in' import cfg with context %} diff --git a/software/gitlab/template/resque.yml.in b/software/gitlab/template/resque.yml.in index 3c55bd32a06905f009d793358d9a2d1a7431e69f..66cd46ca15028fbce0a75719225f0a8c27ea4796 100644 --- a/software/gitlab/template/resque.yml.in +++ b/software/gitlab/template/resque.yml.in @@ -2,6 +2,6 @@ # see: # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/resque.yml.example # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb -# (last udpdated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last udpdated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) production: unix://{{ redis.unixsocket }} diff --git a/software/gitlab/template/smtp_settings.rb.in b/software/gitlab/template/smtp_settings.rb.in index 3177d11e600482596ee09910feffbade400388b7..b7ba4ee3dcf7b1b3647bcfad1f396bfa2913c4f0 100644 --- a/software/gitlab/template/smtp_settings.rb.in +++ b/software/gitlab/template/smtp_settings.rb.in @@ -2,7 +2,7 @@ # see: # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/smtp_settings.rb.sample # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb -# (last updated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) {% from 'macrolib.cfg.in' import cfg, cfg_bool with context %} diff --git a/software/gitlab/template/unicorn.rb.in b/software/gitlab/template/unicorn.rb.in index 55352c1d6a93c96523a57bdfccc605476a307e10..83c18717c931cde5419f352c0513cfe0f0a0bd9f 100644 --- a/software/gitlab/template/unicorn.rb.in +++ b/software/gitlab/template/unicorn.rb.in @@ -3,7 +3,7 @@ # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example.development # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb -# (last updated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) +# (last updated for omnibus-gitlab 8.6.5+ce.0-0-g342f8be) {% from 'macrolib.cfg.in' import cfg with context %}