nixos/gitlab: Remove procps from gitaly service
From my understanding, procps was added to the gitlay systemd service path in #58487 to fix gitaly-ruby's internal memory leak detection. Now that the last ruby remnants have been removed in gitaly 16.0.0, this should not be necessary anymore.
This commit is contained in:
parent
33411f2768
commit
4321e48b68
|
@ -1460,7 +1460,6 @@ in {
|
|||
partOf = [ "gitlab.target" ];
|
||||
path = with pkgs; [
|
||||
openssh
|
||||
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
|
||||
git
|
||||
gzip
|
||||
bzip2
|
||||
|
|
|
@ -1,20 +1,21 @@
|
|||
From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001
|
||||
From: "M. A" <mak@nyantec.com>
|
||||
Date: Sat, 25 Jun 2022 13:34:42 +0000
|
||||
Subject: [PATCH] Remove geo from database.yml
|
||||
From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001
|
||||
From: Yaya <mak@nyantec.com>
|
||||
Date: Tue, 23 May 2023 13:49:18 +0000
|
||||
Subject: [PATCH] Remove unsupported database names
|
||||
|
||||
The only supported ones are main, ci, main_clusterwide.
|
||||
---
|
||||
config/database.yml.postgresql | 28 ----------------------------
|
||||
1 file changed, 28 deletions(-)
|
||||
config/database.yml.postgresql | 35 ----------------------------------
|
||||
1 file changed, 35 deletions(-)
|
||||
|
||||
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
|
||||
index c1b1247b5b08..a81437d1e1b5 100644
|
||||
index b210b9c412bc..900612080416 100644
|
||||
--- a/config/database.yml.postgresql
|
||||
+++ b/config/database.yml.postgresql
|
||||
@@ -26,13 +26,6 @@ production:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
username: git
|
||||
password: "secure password"
|
||||
host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -26,9 +27,9 @@ index c1b1247b5b08..a81437d1e1b5 100644
|
|||
#
|
||||
# Development specific
|
||||
@@ -57,13 +50,6 @@ development:
|
||||
# host: localhost
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
host: localhost
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -40,9 +41,9 @@ index c1b1247b5b08..a81437d1e1b5 100644
|
|||
#
|
||||
# Staging specific
|
||||
@@ -84,13 +70,6 @@ staging:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
username: git
|
||||
password: "secure password"
|
||||
host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -53,10 +54,10 @@ index c1b1247b5b08..a81437d1e1b5 100644
|
|||
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
@@ -117,10 +96,3 @@ test: &test
|
||||
# prepared_statements: false
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
@@ -117,17 +96,3 @@ test: &test
|
||||
prepared_statements: false
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -64,6 +65,13 @@ index c1b1247b5b08..a81437d1e1b5 100644
|
|||
- username: postgres
|
||||
- password:
|
||||
- host: localhost
|
||||
- embedding:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
- database: gitlabhq_embedding_test
|
||||
- username: postgres
|
||||
- password:
|
||||
- host: localhost
|
||||
--
|
||||
2.36.0
|
||||
2.38.4
|
||||
|
|
@ -70,10 +70,10 @@ let
|
|||
./remove-hardcoded-locations.patch
|
||||
|
||||
# Gitlab edited the default database config since [1] and the
|
||||
# installer complains about valid keywords only being "main" and "ci".
|
||||
# installer now complains about valid keywords only being "main", "ci" and "embedded".
|
||||
#
|
||||
# [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028
|
||||
./Remove-geo-from-database.yml.patch
|
||||
./Remove-unsupported-database-names.patch
|
||||
];
|
||||
# One of the patches uses this variable - if it's unset, execution
|
||||
# of rake tasks fails.
|
||||
|
|
|
@ -31,10 +31,10 @@ index da1a15302da..c846db93e5c 100644
|
|||
## Webpack settings
|
||||
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
|
||||
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
|
||||
index 99335321f28..9d9d1c48af4 100644
|
||||
index d096174fca3a..02d0f689c523 100644
|
||||
--- a/config/initializers/1_settings.rb
|
||||
+++ b/config/initializers/1_settings.rb
|
||||
@@ -185,7 +185,7 @@
|
||||
@@ -206,7 +206,7 @@
|
||||
Settings.gitlab['user_home'] ||= begin
|
||||
Etc.getpwnam(Settings.gitlab['user']).dir
|
||||
rescue ArgumentError # no user configured
|
||||
|
@ -43,13 +43,13 @@ index 99335321f28..9d9d1c48af4 100644
|
|||
end
|
||||
Settings.gitlab['time_zone'] ||= nil
|
||||
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
|
||||
@@ -794,7 +794,7 @@
|
||||
@@ -959,7 +959,7 @@
|
||||
# Git
|
||||
#
|
||||
Settings['git'] ||= Settingslogic.new({})
|
||||
Settings['git'] ||= {}
|
||||
-Settings.git['bin_path'] ||= '/usr/bin/git'
|
||||
+Settings.git['bin_path'] ||= 'git'
|
||||
|
||||
|
||||
# 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
|
||||
|
|
Loading…
Reference in a new issue