4321e48b68
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.
78 lines
1.9 KiB
Diff
78 lines
1.9 KiB
Diff
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 | 35 ----------------------------------
|
|
1 file changed, 35 deletions(-)
|
|
|
|
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
|
|
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
|
|
- geo:
|
|
- adapter: postgresql
|
|
- encoding: unicode
|
|
- database: gitlabhq_geo_production
|
|
- username: git
|
|
- password: "secure password"
|
|
- host: localhost
|
|
|
|
#
|
|
# Development specific
|
|
@@ -57,13 +50,6 @@ development:
|
|
host: localhost
|
|
variables:
|
|
statement_timeout: 15s
|
|
- geo:
|
|
- adapter: postgresql
|
|
- encoding: unicode
|
|
- database: gitlabhq_geo_development
|
|
- username: postgres
|
|
- password: "secure password"
|
|
- host: localhost
|
|
|
|
#
|
|
# Staging specific
|
|
@@ -84,13 +70,6 @@ staging:
|
|
username: git
|
|
password: "secure password"
|
|
host: localhost
|
|
- geo:
|
|
- adapter: postgresql
|
|
- encoding: unicode
|
|
- database: gitlabhq_geo_staging
|
|
- username: git
|
|
- password: "secure password"
|
|
- host: localhost
|
|
|
|
# Warning: The database defined as "test" will be erased and
|
|
# re-generated from your development database when you run "rake".
|
|
@@ -117,17 +96,3 @@ test: &test
|
|
prepared_statements: false
|
|
variables:
|
|
statement_timeout: 15s
|
|
- geo:
|
|
- adapter: postgresql
|
|
- encoding: unicode
|
|
- database: gitlabhq_geo_test
|
|
- username: postgres
|
|
- password:
|
|
- host: localhost
|
|
- embedding:
|
|
- adapter: postgresql
|
|
- encoding: unicode
|
|
- database: gitlabhq_embedding_test
|
|
- username: postgres
|
|
- password:
|
|
- host: localhost
|
|
--
|
|
2.38.4
|
|
|