Commit 1aa3b514 authored by iv's avatar iv

gitlab: Sync gitlab-parameters.cfg to upstream

Like for de35c7da.

I've manually reviewed:

    git diff origin/8-8-stable origin/8-9-stable  -- files/gitlab-config-template/gitlab.rb.template \
                                                     files/gitlab-cookbooks/gitlab/attributes/default.rb

on omnibus-gitlab repository.
parent 3e4c76cd
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# #
# TODO better autogenerate from ^^^ (?) # TODO better autogenerate from ^^^ (?)
# #
# (last updated for omnibus-gitlab 8.8.9+ce.0-g25376053) # (last updated for omnibus-gitlab 8-9-stable 5eb2711e)
[gitlab-parameters] [gitlab-parameters]
configuration.external_url = http://lab.example.com configuration.external_url = http://lab.example.com
...@@ -70,8 +70,8 @@ configuration.unicorn_worker_processes = 2 ...@@ -70,8 +70,8 @@ configuration.unicorn_worker_processes = 2
# unicorn advanced # unicorn advanced
configuration.unicorn_backlog_socket = 1024 configuration.unicorn_backlog_socket = 1024
configuration.unicorn_worker_memory_limit_min = 300*(1024**2) configuration.unicorn_worker_memory_limit_min = 400*(1024**2)
configuration.unicorn_worker_memory_limit_max = 350*(1024**2) configuration.unicorn_worker_memory_limit_max = 650*(1024**2)
# nginx # nginx
...@@ -85,7 +85,7 @@ configuration.nginx_ssl_protocols = TLSv1 TLSv1.1 TLSv1.2 ...@@ -85,7 +85,7 @@ configuration.nginx_ssl_protocols = TLSv1 TLSv1.1 TLSv1.2
configuration.nginx_ssl_session_cache = builtin:1000 shared:SSL:10m configuration.nginx_ssl_session_cache = builtin:1000 shared:SSL:10m
configuration.nginx_ssl_session_timeout = 5m configuration.nginx_ssl_session_timeout = 5m
configuration.nginx_proxy_read_timeout = 300 configuration.nginx_proxy_read_timeout = 3600
configuration.nginx_proxy_connect_timeout = 300 configuration.nginx_proxy_connect_timeout = 300
# nginx advanced # nginx advanced
...@@ -101,6 +101,7 @@ configuration.nginx_gzip_comp_level = 2 ...@@ -101,6 +101,7 @@ configuration.nginx_gzip_comp_level = 2
configuration.nginx_gzip_proxied = any configuration.nginx_gzip_proxied = any
configuration.nginx_gzip_types = text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json configuration.nginx_gzip_types = text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json
configuration.nginx_keepalive_timeout = 65 configuration.nginx_keepalive_timeout = 65
configuration.server_names_hash_bucket_size = 64
# TODO allow configuring trusted proxies # TODO allow configuring trusted proxies
# configuration.nginx_real_ip_trusted_addresses # configuration.nginx_real_ip_trusted_addresses
......
...@@ -303,7 +303,7 @@ md5sum = eb1230fee50067924ba89f4dc6e82fa9 ...@@ -303,7 +303,7 @@ md5sum = eb1230fee50067924ba89f4dc6e82fa9
[gitlab-parameters.cfg] [gitlab-parameters.cfg]
<= download-file <= download-file
md5sum = a74670934ec0190cc212d1f3468c11ed md5sum = 30cadd558b3c4d104314b1e40eba0f55
[gitlab-shell-config.yml.in] [gitlab-shell-config.yml.in]
<= download-template <= download-template
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment