Refactor database configs
* Move postgres credentials to ENV vars * Allow postgres in development * Allow SQlite in production * Refactor optional lndhub db config Co-authored-by: Greg Karékinian <greg@karekinian.com>
This commit is contained in:
@@ -1,25 +1,37 @@
|
||||
default: &default
|
||||
adapter: sqlite3
|
||||
adapter: <%= ENV["DB_ADAPTER"] || "sqlite3" %>
|
||||
pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
|
||||
timeout: 5000
|
||||
<% if ENV["DB_ADAPTER"] == "postgresql" %>
|
||||
host: <%= ENV["PG_HOST"] || 'localhost' %>
|
||||
port: <%= ENV["PG_PORT"] || 5432 %>
|
||||
username: <%= ENV["PG_USERNAME"] || 'akkounts' %>
|
||||
password: <%= ENV["PG_PASSWORD"] %>
|
||||
<% end %>
|
||||
|
||||
<% if ENV["LNDHUB_PG_HOST"].present? %>
|
||||
lndhub: &lndhub
|
||||
adapter: postgresql
|
||||
database_tasks: false
|
||||
host: <%= ENV["LNDHUB_PG_HOST"] %>
|
||||
port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
|
||||
database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
|
||||
username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
|
||||
password: <%= ENV["LNDHUB_PG_PASSWORD"] %>
|
||||
<% end %>
|
||||
|
||||
development:
|
||||
primary:
|
||||
<<: *default
|
||||
database: db/development.sqlite3
|
||||
database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE"] : "db/development.sqlite3" %>
|
||||
queue:
|
||||
<<: *default
|
||||
database: db/development_queue.sqlite3
|
||||
database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE_QUEUE"] : "db/development_queue.sqlite3" %>
|
||||
migrations_paths: db/queue_migrate
|
||||
<% if ENV["LNDHUB_PG_HOST"].present? %>
|
||||
lndhub:
|
||||
<<: *default
|
||||
adapter: postgresql
|
||||
database_tasks: false
|
||||
host: <%= ENV["LNDHUB_PG_HOST"] || 'localhost' %>
|
||||
port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
|
||||
database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
|
||||
username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
|
||||
password: <%= ENV["LNDHUB_PG_PASSWORD"] %>
|
||||
<<: *lndhub
|
||||
<% end %>
|
||||
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
@@ -36,18 +48,12 @@ test:
|
||||
production:
|
||||
primary:
|
||||
<<: *default
|
||||
adapter: postgresql
|
||||
database: akkounts
|
||||
port: 5432
|
||||
host: <%= Rails.application.credentials.postgres[:host] rescue nil %>
|
||||
username: <%= Rails.application.credentials.postgres[:username] rescue nil %>
|
||||
password: <%= Rails.application.credentials.postgres[:password] rescue nil %>
|
||||
lndhub:
|
||||
database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE"] : "db/production.sqlite3" %>
|
||||
queue:
|
||||
<<: *default
|
||||
adapter: postgresql
|
||||
database_tasks: false
|
||||
host: <%= ENV["LNDHUB_PG_HOST"] || 'localhost' %>
|
||||
port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
|
||||
database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
|
||||
username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
|
||||
password: <%= ENV["LNDHUB_PG_PASSWORD"] %>
|
||||
database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE_QUEUE"] : "db/production_queue.sqlite3" %>
|
||||
migrations_paths: db/queue_migrate
|
||||
<% if ENV["LNDHUB_PG_HOST"].present? %>
|
||||
lndhub:
|
||||
<<: *lndhub
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user