Fixed production actionmailer settings

eladmeidar · Dec 4, 2009 · cb67126 · cb67126
1 parent c51a717
commit cb67126
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 2 deletions.
diff --git a/REVISION b/REVISION
@@ -0,0 +1 @@
+c51a71785496d3503bfad37d898b11e13c790574
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -12,6 +12,12 @@ class ApplicationController < ActionController::Base
 
   helper_method :current_user
 
+  before_filter :mailer_set_url_options
+
+  def mailer_set_url_options
+    ActionMailer::Base.default_url_options[:host] = request.host_with_port
+  end
+
   def require_user
     if ! current_user
       flash[:notice] = "Please login"

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
@@ -1,5 +1,5 @@
 class Notifier < ActionMailer::Base
-  default_url_options[:host] = "referencebin.com"
+  #default_url_options[:host] = "referencebin.com"
 
   def verification_instructions(user)
     subject "prb - Email Verification"

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -24,5 +24,15 @@
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
 
+ActionMailer::Base.delivery_method = :sendmail
+#ActionMailer::Base.sendmail_settings = {
+#  :location => '/usr/sbin/sendmail',
+#  :arguments => '-i -t'
+#}
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.raise_delivery_errors = true
+ActionMailer::Base.default_charset = "iso-8859-1"
+
+
 # Enable threaded mode
-# config.threadsafe!
+# config.threadsafe!
diff --git a/db/sphinx b/db/sphinx
@@ -0,0 +1 @@
+/Library/rails/prb-edge/shared/db/sphinx
diff --git a/log b/log
@@ -0,0 +1 @@
+/Library/rails/prb-edge/shared/log
diff --git a/public/system b/public/system
@@ -0,0 +1 @@
+/Library/rails/prb-edge/shared/system
diff --git a/tmp/pids b/tmp/pids
@@ -0,0 +1 @@
+/Library/rails/prb-edge/shared/pids