diff options
Diffstat (limited to 'pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index e7d704237ae..1a468724e35 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -53,7 +53,7 @@ index d096174fca3a..02d0f689c523 100644 # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in diff --git a/config/puma.rb.example b/config/puma.rb.example -index 9fc354a8fe8..2352ca9b58c 100644 +index 07a6f6a25015..14a718a43202 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -5,12 +5,8 @@ @@ -71,7 +71,7 @@ index 9fc354a8fe8..2352ca9b58c 100644 # Configure "min" to be the minimum number of threads to use to answer # requests and "max" the maximum. -@@ -31,12 +27,12 @@ queue_requests false +@@ -31,11 +27,11 @@ queue_requests false # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only # accepted protocols. @@ -81,14 +81,12 @@ index 9fc354a8fe8..2352ca9b58c 100644 workers 3 -require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" --require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer" +require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/lifecycle_events" -+require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/puma_worker_killer_initializer" on_restart do # Signal application hooks that we're about to restart -@@ -80,7 +76,7 @@ if defined?(nakayoshi_fork) - end +@@ -74,7 +70,7 @@ worker_timeout 60 + wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # Use json formatter -require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" |