From 6e45b9f410fff5cb86cc98b28b0af93befa5cc34 Mon Sep 17 00:00:00 2001 From: Mitchell Henke Date: Fri, 10 Mar 2023 10:11:04 -0600 Subject: [PATCH] Add primary database socket configuration changelog: Internal, Database, Add primary database socket configuration --- config/application.yml.default | 1 + config/database.yml | 2 +- lib/identity_config.rb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/application.yml.default b/config/application.yml.default index 4d730b64a56..644641747ce 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -73,6 +73,7 @@ doc_auth_error_sharpness_threshold: 40 doc_auth_error_glare_threshold: 40 database_pool_extra_connections_for_worker: 4 database_pool_idp: 5 +database_socket: '' database_statement_timeout: 2_500 database_timeout: 5_000 deliver_mail_async: false diff --git a/config/database.yml b/config/database.yml index 2c6db8b6611..c9e9cd9efd1 100644 --- a/config/database.yml +++ b/config/database.yml @@ -78,7 +78,7 @@ production: <<: *defaults database: <%= IdentityConfig.store.database_name %> username: <%= IdentityConfig.store.database_username %> - host: <%= IdentityConfig.store.database_host %> + host: <%= IdentityConfig.store.database_socket.present? ? IdentityConfig.store.database_socket : IdentityConfig.store.database_host %> password: <%= IdentityConfig.store.database_password %> pool: <%= primary_pool %> sslmode: 'verify-full' diff --git a/lib/identity_config.rb b/lib/identity_config.rb index 714cf08c821..e68afe20453 100644 --- a/lib/identity_config.rb +++ b/lib/identity_config.rb @@ -139,6 +139,7 @@ def self.build_store(config_map) config.add(:database_password, type: :string) config.add(:database_pool_extra_connections_for_worker, type: :integer) config.add(:database_pool_idp, type: :integer) + config.add(:database_socket, type: :string) config.add(:database_statement_timeout, type: :integer) config.add(:database_timeout, type: :integer) config.add(:database_username, type: :string)