Switch from HOST and SCHEME to BASE_URL env var

install-doc
Marcin Kulik 7 years ago
parent ddca9db3e1
commit 1a84b0cbdd

@ -1,4 +1,6 @@
HOST=localhost:3000
## Base URL of your asciinema web app instance
BASE_URL=http://localhost:3000
MAILNAME=localhost
# Run `docker-compose run --rm web bundle exec rake secret`

@ -67,7 +67,7 @@ module Asciinema
)
end
config.action_mailer.default_url_options = { protocol: CFG.scheme, host: CFG.host }
config.action_mailer.default_url_options = { protocol: CFG.scheme, host: CFG.hostname_with_port }
if CFG.smtp_settings
config.action_mailer.smtp_settings = CFG.smtp_settings

@ -1,7 +1,10 @@
require 'uri'
module Asciinema
class Configuration
include Virtus.model
attribute :base_url, String, default: 'http://localhost:3000'
attribute :bugsnag_api_key, String
attribute :aws_access_key_id, String
attribute :aws_secret_access_key, String
@ -10,8 +13,6 @@ module Asciinema
attribute :carrierwave_storage_dir_prefix, String, default: 'uploads/'
attribute :google_analytics_id, String
attribute :home_asciicast_id, Integer
attribute :scheme, String, default: 'http'
attribute :host, String, default: 'localhost:3000'
attribute :secret_key_base, String
attribute :admin_ids, Array[Integer]
attribute :smtp_settings, Hash
@ -25,6 +26,21 @@ module Asciinema
end
end
def scheme
URI.parse(base_url).scheme
end
def hostname_with_port
uri = URI.parse(base_url)
hwp = uri.hostname
if uri.port != uri.default_port
hwp = "#{hwp}:#{uri.port}"
end
hwp
end
def ssl?
scheme == 'https'
end

Loading…
Cancel
Save