create flexible config for hosts using DATABASE_URL and DATABASE_HOST

restarone · Nov 30, 2024 · 143ebf1 · 143ebf1
1 parent 41e97d8
commit 143ebf1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/layouts/website.html.erb b/app/views/layouts/website.html.erb
@@ -21,7 +21,7 @@
   <%= render partial: 'shared/flash' %>
   <%= render partial: 'shared/navbars/web_admin' %>
 
-    <%= "postgres://#{ENV['DATABASE_USERNAME']}:#{ENV['DATABASE_PASSWORD']}@#{ENV['DATABASE_HOST']}:#{ENV['DATABASE_PORT']}/#{ENV['DATABASE_NAME']}" %>
+  <%= ENV['DATABASE_HOST'] ? "postgres://#{ENV['DATABASE_USERNAME']}:#{ENV['DATABASE_PASSWORD']}@#{ENV['DATABASE_HOST']}:#{ENV['DATABASE_PORT']}/#{ENV['DATABASE_NAME']}" : ENV['DATABASE_URL'] %>
   <body data-page-id="<%= @cms_page&.id %>">
     <%= yield %>
     <%= render_cookies_consent_ui %>

diff --git a/config/blazer.yml b/config/blazer.yml
@@ -2,7 +2,7 @@
 
 data_sources:
   main:
-    url: <%= "postgres://#{ENV['DATABASE_USERNAME']}:#{ENV['DATABASE_PASSWORD']}@#{ENV['DATABASE_HOST']}:#{ENV['DATABASE_PORT']}/#{ENV['DATABASE_NAME']}" %>
+    url: <%= ENV['DATABASE_HOST'] ? "postgres://#{ENV['DATABASE_USERNAME']}:#{ENV['DATABASE_PASSWORD']}@#{ENV['DATABASE_HOST']}:#{ENV['DATABASE_PORT']}/#{ENV['DATABASE_NAME']}" : ENV['DATABASE_URL'] %>
     # statement timeout, in seconds
     # none by default
     # timeout: 15