update defaults

software/gitlab/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = c559a24ab6281268b608ed3bccb8e4ce
 
 [gitlab-parameters.cfg]
 _update_hash_filename_ = gitlab-parameters.cfg
-md5sum = f02bc3416d9597c6bc6bf627db732dbf
+md5sum = 95b18789111ed239146d243e39ffefbe
 
 [gitlab-shell-config.yml.in]
 _update_hash_filename_ = template/gitlab-shell-config.yml.in
@@ -46,7 +46,7 @@ md5sum = f21ad3ae0e96e80ca4ea3819d4e9097f
 
 [gitlab.yml.in]
 _update_hash_filename_ = template/gitlab.yml.in
-md5sum = 0618288bd77ccbc7f7e9460be230fbf8
+md5sum = 6f8df1467a6168bde7d2f5f42abb1012
 
 [gitaly-config.toml.in]
 _update_hash_filename_ = template/gitaly-config.toml.in

software/gitlab/gitlab-parameters.cfg

@@ -19,7 +19,7 @@ configuration.rack_attack_enable        = true
 configuration.rack_attack_max_retry     = 10
 configuration.rack_attack_find_time     = 60
 configuration.rack_attack_ban_time      = 3600
-configuration.rack_attack_ip_whitelist  =
+configuration.rack_attack_ip_whitelist  = 127.0.0.1
 
 configuration.time_zone                 = UTC
 

software/gitlab/template/gitlab.yml.in

@@ -551,11 +551,6 @@ production: &base
     <% end %>
     #}
 
-    {# we are ok (for now) with default rack-attack git settings
-    rack_attack:
-      git_basic_auth: <%= @rack_attack_git_basic_auth.to_json if @rack_attack_git_basic_auth %>
-    #}
-
 
     ## Site ICP License
     # XXX unquote needed only for slapos.core earlier than