gitlab: Slapos'ify gitlab config updates

Do not use container_registry and registry_* options

software/gitlab/software.cfg

@@ -244,7 +244,7 @@ md5sum  = a9cb347f60aad3465932fd36cd4fe25d
 
 [gitlab.yml.in]
 <= download-template
-md5sum  = 735a78d0733fd6617d3b5f3d91bfae8c
+md5sum  = a403f22950c7d6c5e34ebec6abd6cda9
 
 [instance-gitlab.cfg.in]
 <= download-file
@@ -260,11 +260,11 @@ md5sum  = a11b50d2ff2b1fa842ba4aa20041e2fe
 
 [nginx.conf.in]
 <= download-template
-md5sum  = 7da68dba86fff79eb93c27aa1aaf1055
+md5sum  = de5a16a2ee7925c7dfbc40644ace9256
 
 [rack_attack.rb.in]
 <= download-template
-md5sum  = bc1a7c1e83b7329d97bff6724f2bec3e
+md5sum  = 3f876b3baafd696f47d027ac247f84e0
 
 [resque.yml.in]
 <= download-template
@@ -272,7 +272,7 @@ md5sum  = 7c89a730889e3224548d9abe51a2d719
 
 [smtp_settings.rb.in]
 <= download-template
-md5sum  = d66a424516ffacea34303e2f512a7d94
+md5sum  = 1b9dc4731619d021eb070d9d43e60f68
 
 [unicorn.rb.in]
 <= download-template

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.7.9+ce.1-0-gf589ad7)
+# (last updated for omnibus-gitlab 8.8.7+ce.1-0-g51164768)
 
 {% from 'macrolib.cfg.in' import cfg, cfg_https, external_url  with context %}
 
@@ -86,6 +86,7 @@ production: &base
       wiki:             {{ cfg('default_projects_features.wiki') }}
       snippets:         {{ cfg('default_projects_features.snippets') }}
       builds: false {# builds not supported yet <%= @gitlab_default_projects_features_builds %> #}
+      {# container_registry: <%= @gitlab_default_projects_features_container_registry %> #}
 
     ## Webhook settings
     # Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)
@@ -145,6 +146,7 @@ production: &base
     storage_path: <%= @lfs_storage_path %>
   #}
 
+  {# we do not support Container Registry
   ## Container Registry
   registry:
     enabled: <%= @registry_enabled %>
@@ -154,6 +156,7 @@ production: &base
     path: <%= @registry_path %>
     key: <%= @registry_key_path %>
     issuer: <%= @registry_issuer %>
+  #}
 
   {# we do not support Pages
   ## GitLab Pages (EE only)

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.7.9+ce.1-0-gf589ad7)
+# (last updated for omnibus-gitlab 8.8.7+ce.1-0-g51164768)
 
 {% from 'macrolib.cfg.in' import cfg  with context %}
 
@@ -53,6 +53,8 @@ http {
   {# we don't need: ci, pages, mattermost
   include <%= @gitlab_ci_http_config %>
   include <%= @gitlab_pages_http_config %>;
-  include <%= @gitlab_mattermost_http_config %>
+  include <%= @gitlab_mattermost_http_config %>;
+  include <%= @gitlab_registry_http_config %>;
+  <%= @custom_nginx_config %>
   #}
 }

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.7.9+ce.1-0-gf589ad7)
+# (last updated for omnibus-gitlab 8.8.7+ce.1-0-g51164768)
 
 {% from 'macrolib.cfg.in' import cfg  with context %}
 
@@ -27,7 +27,7 @@ paths_regex = Regexp.union(paths_to_be_protected.map { |path| /\A#{Regexp.escape
 rack_attack_enabled = Gitlab.config.rack_attack.git_basic_auth['enabled']
 
 unless Rails.env.test? || !rack_attack_enabled
-  Rack::Attack.throttle('protected paths', limit: <%= @rate_limit_requests_per_period %>, period: <%= @rate_limit_period %>.seconds) do |req|
+  Rack::Attack.throttle('protected paths', limit: {{ cfg('rate_limit_requests_per_period') }}, period: {{ cfg('rate_limit_period') }}.seconds) do |req|
     if req.post? && req.path =~ paths_regex
       req.ip
     end

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.7.9+ce.1-0-gf589ad7)
+# (last updated for omnibus-gitlab 8.8.7+ce.1-0-g51164768)
 
 {% from 'macrolib.cfg.in' import cfg, cfg_bool  with context %}