[tor-commits] [dip/master] Remove some gitaly specific configuration

[hiro at torproject.org]

commit 09fbc71186b90ed9e366daff1787d50db579127e
Author: hiro <hiro at torproject.org>
Date:   Mon Jan 13 19:02:29 2020 +0100

    Remove some gitaly specific configuration
---
 roles/gitaly/templates/gitaly.toml.j2 | 1 -
 roles/gitlab/templates/unicorn.rb.j2  | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/roles/gitaly/templates/gitaly.toml.j2 b/roles/gitaly/templates/gitaly.toml.j2
index fe52ded..1d4b130 100644
--- a/roles/gitaly/templates/gitaly.toml.j2
+++ b/roles/gitaly/templates/gitaly.toml.j2
@@ -1,7 +1,6 @@
 # Example Gitaly configuration file
 
 socket_path = "{{ ansible_env.XDG_RUNTIME_DIR | mandatory }}/gitaly/gitaly.socket"
-internal_socket_dir = "{{ ansible_env.XDG_RUNTIME_DIR | mandatory }}/gitaly/gitaly.socket"
 
 # The directory where Gitaly's executables are stored
 bin_dir = "{{ ansible_user_dir }}/bin"
diff --git a/roles/gitlab/templates/unicorn.rb.j2 b/roles/gitlab/templates/unicorn.rb.j2
index 406b359..338808a 100644
--- a/roles/gitlab/templates/unicorn.rb.j2
+++ b/roles/gitlab/templates/unicorn.rb.j2
@@ -81,9 +81,6 @@ ENV['GITLAB_UNICORN_MEMORY_MIN'] = (600 * 1 << 20).to_s
 # Max memory size (RSS) per worker
 ENV['GITLAB_UNICORN_MEMORY_MAX'] = (800 * 1 << 20).to_s
 
-# Do not limit gitaly
-ENV['GITALY_DISABLE_REQUEST_LIMITS'] = '1'
-
 require_relative "{{ ansible_user_dir }}/gitlab/lib/gitlab/cluster/lifecycle_events"
 
 before_exec do |server|