eacee54846
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684, using the well-defined semantics of the uri object. The pod_url is normalized using module URI's functions, always with a trailing /. The diaspora-handle will always reflect the pod_url with this patch i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se; previous code stripped the www. prefix. If this is a problem, it should be addressed by another setting, since one cannot presume that www.domain.tld resolves to the same address as domain.tld.
27 lines
1 KiB
Ruby
27 lines
1 KiB
Ruby
# Copyright (c) 2010, Diaspora Inc. This file is
|
|
# licensed under the Affero General Public License version 3 or later. See
|
|
# the COPYRIGHT file.
|
|
|
|
Diaspora::Application.configure do
|
|
config.action_mailer.default_url_options = {:host => APP_CONFIG[:pod_uri].host}
|
|
unless Rails.env == 'test' || APP_CONFIG[:mailer_on] != true
|
|
config.action_mailer.delivery_method = :smtp
|
|
if APP_CONFIG[:smtp_authentication] == "none"
|
|
config.action_mailer.smtp_settings = {
|
|
:address => APP_CONFIG[:smtp_address],
|
|
:port => APP_CONFIG[:smtp_port],
|
|
:domain => APP_CONFIG[:smtp_domain]
|
|
}
|
|
else
|
|
config.action_mailer.smtp_settings = {
|
|
:address => APP_CONFIG[:smtp_address],
|
|
:port => APP_CONFIG[:smtp_port],
|
|
:domain => APP_CONFIG[:smtp_domain],
|
|
:authentication => APP_CONFIG[:smtp_authentication],
|
|
:user_name => APP_CONFIG[:smtp_username],
|
|
:password => APP_CONFIG[:smtp_password],
|
|
:enable_starttls_auto => true
|
|
}
|
|
end
|
|
end
|
|
end
|