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  = 176939a6428a7aca4767a36421b0af2b
 
 [instance-gitlab.cfg.in]
 <= download-file
@@ -260,11 +260,11 @@ md5sum  = a11b50d2ff2b1fa842ba4aa20041e2fe
 
 [nginx.conf.in]
 <= download-template
-md5sum  = 7da68dba86fff79eb93c27aa1aaf1055
+md5sum  = 1374f38ab6f295b850d45ea0019ec05d
 
 [rack_attack.rb.in]
 <= download-template
-md5sum  = bc1a7c1e83b7329d97bff6724f2bec3e
+md5sum  = 7d0e6dc6b826f6df6b20d8574a29e2f8
 
 [resque.yml.in]
 <= download-template
@@ -272,7 +272,7 @@ md5sum  = 7c89a730889e3224548d9abe51a2d719
 
 [smtp_settings.rb.in]
 <= download-template
-md5sum  = d66a424516ffacea34303e2f512a7d94
+md5sum  = c67ea492e17f774d0e18f1217338a55f
 
 [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.9+ce.0-g25376053)
 
 {% from 'macrolib.cfg.in' import cfg, cfg_https, external_url  with context %}
 
@@ -86,7 +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 %>
+      {# 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)
@@ -146,6 +146,7 @@ production: &base
     storage_path: <%= @lfs_storage_path %>
   #}
 
+  {# we do not support container registry
   ## Container Registry
   registry:
     enabled: <%= @registry_enabled %>
@@ -155,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.9+ce.0-g25376053)
 
 {% from 'macrolib.cfg.in' import cfg  with context %}
 
@@ -50,13 +50,11 @@ http {
 
   include {{ nginx_gitlab_http_conf }};
 
-  {# we don't need: ci, pages, mattermost
+  {# we don't need: ci, pages, mattermost, registry
   include <%= @gitlab_ci_http_config %>
   include <%= @gitlab_pages_http_config %>;
   include <%= @gitlab_mattermost_http_config %>
-  #}
-  <% if @gitlab_registry_http_config %>
   include <%= @gitlab_registry_http_config %>;
-  <% end %>
+  #}
 
 }

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.9+ce.0-g25376053)
 
 {% from 'macrolib.cfg.in' import cfg  with context %}
 

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.9+ce.0-g25376053)
 
 {% from 'macrolib.cfg.in' import cfg, cfg_bool  with context %}
 
@@ -16,9 +16,7 @@ if Rails.env.production?
     user_name:              "{{ cfg('smtp_user_name') }}",
     password:               "{{ cfg('smtp_password') }}",
     domain:                 "{{ cfg('smtp_domain') }}",
-    <% unless @smtp_authentication.nil? %>
     authentication:         :{{ cfg('smtp_authentication') }},
-    <% end %>
     enable_starttls_auto:   {{ cfg('smtp_enable_starttls_auto') }},
     # ssl:
     openssl_verify_mode:    '{{ cfg("smtp_openssl_verify_mode") }}'