Merge branch 'master' into bn_launcher_integration

This commit is contained in:
bruckwubete
2018-07-09 13:20:34 -04:00
12 changed files with 52 additions and 24 deletions

View File

@ -90,6 +90,7 @@ Rails.application.configure do
config.active_record.dump_schema_after_migration = false
# Set the relative url root for deployment to a subdirectory.
config.relative_url_root = "/"
config.relative_url_root = ENV['RELATIVE_URL_ROOT'] if ENV['RELATIVE_URL_ROOT'].present?
if ENV['RELATIVE_URL_ROOT'] != "/"
config.relative_url_root = ENV['RELATIVE_URL_ROOT'] || "/b"
end
end

View File

@ -11,7 +11,7 @@ threads threads_count, threads_count
# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
#
port ENV.fetch("PORT") { 3000 }
port ENV.fetch("PORT") { 80 }
# Specifies the `environment` that Puma will run in.
#