Merge pull request #1880 from SUSE/make-containerized-deployment-more…

…-configurable Make containerized deployment more configurable
SUSE · Jul 26, 2018 · e886d51 · e886d51
2 parents 8c9b4f8 + 4b57ad6
commit e886d51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/config/database.yml b/config/database.yml
@@ -31,6 +31,9 @@ default: &default
   <% if ENV["PORTUS_DB_TIMEOUT"] %>
   timeout: <%= ENV['PORTUS_DB_TIMEOUT'] %>
   <% end %>
+  <% if ENV['PORTUS_DB_SOCKET'] %>
+  socket:  <%= ENV['PORTUS_DB_SOCKET'] %>
+  <% end %>
 
 <%= Rails.env.downcase %>:
   <<: *default

diff --git a/config/puma.rb b/config/puma.rb
@@ -16,7 +16,7 @@
 #     purposes inside of a container.
 #  3. UNIX socket. This is the default and it's good for development purposes if
 #     you are not using a container setup.
-if ENV["PORTUS_PUMA_HOST"]
+if ENV["PORTUS_PUMA_HOST"] && ENV["PORTUS_PUMA_USE_UNIX_SOCKET"] != "true"
   if ENV["PORTUS_PUMA_TLS_KEY"]
     host, port = ENV["PORTUS_PUMA_HOST"].split(":")
     port ||= "3000"