changed configurations for Azure

app/views/devise/mailer/reset_password_instructions.html.erb

@@ -3,8 +3,9 @@
 Someone has requested a link to change your password.
 Someone has requested a link to change your password.
 You can do this through the link below.
 You can do this through the link below.
 
 
+<p><%= link_to t('.password_change_link'), edit_password_url(@resource, reset_password_token: @token, config: message['client-config'].to_s, redirect_url: message['redirect-url'].to_s)\
+.html_safe %></p>
 
 
-<p><%= link_to t('.password_change_link'), edit_password_url(@resource, reset_password_token: @token, config: message['client-config'].to_s, redirect_url: message['redirect-url'].to_s).html_safe %></p>
 <p>
 <p>
 If you didn't request this, please ignore this email.
 If you didn't request this, please ignore this email.
 </p>
 </p>

config/deploy/azure.rb

@@ -3,7 +3,7 @@
 # Defines a single server with a list of roles and multiple properties.
 # Defines a single server with a list of roles and multiple properties.
 # You can define all roles on a single server, or split them:
 # You can define all roles on a single server, or split them:
 
 
-server "cloud2.wattsworth.net", user: "rails", roles: %w{app db web}, port: 22
+server "azure.wattsworth.net", user: "rails", roles: %w{app db web}, port: 22
 # server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
 # server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
 # server "db.example.com", user: "deploy", roles: %w{db}
 # server "db.example.com", user: "deploy", roles: %w{db}
 set :deploy_to, "/opt/api"
 set :deploy_to, "/opt/api"

config/environments/development.rb

@@ -37,7 +37,7 @@ Rails.application.configure do
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings =
   config.action_mailer.smtp_settings =
-      { :address => "localhost", :port => 1025 }
+      { :address => "localhost", :port => 1026 }
 
 
   # Print deprecation notices to the Rails logger.
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
   config.active_support.deprecation = :log

config/initializers/devise.rb

@@ -18,7 +18,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
   # with default "from" parameter.
-  config.mailer_sender = 'do-not-reply@wattsworth.net'
+  config.mailer_sender = 'wattsworth@wattsworth.net'
 
 
   # Configure the class responsible to send e-mails.
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
   # config.mailer = 'Devise::Mailer'