2023-03-09 19:26:01 +00:00
|
|
|
diff --git a/config/database.yml.postgresql.orig b/config/database.yml.postgresql
|
2023-06-25 14:48:17 +00:00
|
|
|
index b210b9c..9006120 100644
|
2023-03-09 19:26:01 +00:00
|
|
|
--- a/config/database.yml.postgresql.orig
|
2023-01-11 17:30:28 +00:00
|
|
|
+++ b/config/database.yml.postgresql
|
2023-06-25 14:48:17 +00:00
|
|
|
@@ -26,13 +26,6 @@ production:
|
|
|
|
username: git
|
|
|
|
password: "secure password"
|
|
|
|
host: localhost
|
2023-01-11 17:30:28 +00:00
|
|
|
- geo:
|
|
|
|
- adapter: postgresql
|
|
|
|
- encoding: unicode
|
|
|
|
- database: gitlabhq_geo_production
|
|
|
|
- username: git
|
|
|
|
- password: "secure password"
|
|
|
|
- host: localhost
|
2023-06-25 14:48:17 +00:00
|
|
|
|
2023-01-11 17:30:28 +00:00
|
|
|
#
|
|
|
|
# Development specific
|
2023-03-09 19:26:01 +00:00
|
|
|
@@ -57,13 +50,6 @@ development:
|
2023-06-25 14:48:17 +00:00
|
|
|
host: localhost
|
|
|
|
variables:
|
|
|
|
statement_timeout: 15s
|
2023-01-11 17:30:28 +00:00
|
|
|
- geo:
|
|
|
|
- adapter: postgresql
|
|
|
|
- encoding: unicode
|
|
|
|
- database: gitlabhq_geo_development
|
|
|
|
- username: postgres
|
|
|
|
- password: "secure password"
|
|
|
|
- host: localhost
|
|
|
|
|
|
|
|
#
|
|
|
|
# Staging specific
|
2023-03-09 19:26:01 +00:00
|
|
|
@@ -84,13 +70,6 @@ staging:
|
2023-06-25 14:48:17 +00:00
|
|
|
username: git
|
|
|
|
password: "secure password"
|
|
|
|
host: localhost
|
2023-01-11 17:30:28 +00:00
|
|
|
- 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".
|
2023-06-25 14:48:17 +00:00
|
|
|
@@ -117,17 +96,3 @@ test: &test
|
|
|
|
prepared_statements: false
|
|
|
|
variables:
|
|
|
|
statement_timeout: 15s
|
2023-01-11 17:30:28 +00:00
|
|
|
- geo:
|
|
|
|
- adapter: postgresql
|
|
|
|
- encoding: unicode
|
|
|
|
- database: gitlabhq_geo_test
|
|
|
|
- username: postgres
|
|
|
|
- password:
|
|
|
|
- host: localhost
|
2023-06-25 14:48:17 +00:00
|
|
|
- embedding:
|
|
|
|
- adapter: postgresql
|
|
|
|
- encoding: unicode
|
|
|
|
- database: gitlabhq_embedding_test
|
|
|
|
- username: postgres
|
|
|
|
- password:
|
|
|
|
- host: localhost
|