mailer: Added support for /usr/sbin/sendmail.

This fixes bug #788.

config/app_config.yml.example

@@ -46,6 +46,10 @@ default:
   # ActionMailer class.
   mailer_on: false
 
+  # This chooses which mailer should be used. 'smtp' for a smtp
+  # connection or 'sendmail' to use the sendmail binary.
+  mailer_method: 'smtp'
+
   # Address/port to smtp server handing outgoing mail.
   smtp_address: 'smtp.example.com'
   smtp_port: '587'
@@ -66,6 +70,9 @@ default:
   smtp_username: 'smtp_username'
   smtp_password: 'secret'
 
+  # The path to the sendmail binary.
+  sendmail_location: '/usr/sbin/sendmail'
+
   #google analytics key, if false, it won't include the javascript
   google_a_site: false
   

config/initializers/mailer_config.rb

@@ -5,12 +5,19 @@
 Diaspora::Application.configure do
   config.action_mailer.default_url_options = {:host => AppConfig[:pod_uri].host}
   unless Rails.env == 'test' || AppConfig[:mailer_on] != true
+    if AppConfig[:mailer_method] == "sendmail"
+      config.action_mailer.delivery_method = :sendmail
+      config.action_mailer.sendmail_settings = {
+        :location => AppConfig[:sendmail_location]
+      }
+    else
       config.action_mailer.delivery_method = :smtp
       if AppConfig[:smtp_authentication] == "none"
         config.action_mailer.smtp_settings = {
           :address => AppConfig[:smtp_address],
           :port => AppConfig[:smtp_port],
-        :domain => AppConfig[:smtp_domain]
+          :domain => AppConfig[:smtp_domain],
+          :enable_starttls_auto => false
         }
       else
         config.action_mailer.smtp_settings = {
@@ -24,4 +31,5 @@ Diaspora::Application.configure do
         }
       end
     end
+  end
 end