Changeset 6095

Timestamp:

01/31/07 02:09:45 (2 years ago)

Author:

nzkoz

Message:

Rename server_settings to smtp_settings, add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Koz]

Files:

• trunk/actionmailer/CHANGELOG (modified) (1 diff)
• trunk/actionmailer/lib/action_mailer/base.rb (modified) (5 diffs)

trunk/actionmailer/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Rename server_settings to smtp settings, and add  sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Koz]
-
-* Allow mailer actions named send by using __send__ internally.  #6467 [iGEL]

trunk/actionmailer/lib/action_mailer/base.rb

@@ -185 +185 @@
-  #   Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
-  #
-erver_settings</tt> -  Allows detailed configuration of the server
+mtp_settings</tt> -  Allows detailed configuration for :smtp delivery method
-  #   * <tt>:address</tt> Allows you to use a remote mail server. Just change it from its default "localhost" setting.
-  #   * <tt>:port</tt> On the off chance that your mail server doesn't run on port 25, you can change it.
@@ -194 +194 @@
-  #     This is a symbol and one of :plain, :login, :cram_md5
-  #
+  # * <tt>sendmail_settings</tt> - Allows you to override options for the :sendmail delivery method
+  #   * <tt>:location</tt> The location of the sendmail executable, defaults to "/usr/sbin/sendmail"
+  #   * <tt>:arguments</tt> The command line arguments
-  # * <tt>raise_delivery_errors</tt> - whether or not errors should be raised if the email fails to be delivered.
-  #
-  # * <tt>delivery_method</tt> - Defines a delivery method. Possible values are :smtp (default), :sendmail, and :test.
-  #   Sendmail is assumed to be present at "/usr/sbin/sendmail".
-  #
-  # * <tt>perform_deliveries</tt> - Determines whether deliver_* methods are actually carried out. By default they are,
@@ -229 +231 @@
-    cattr_accessor :logger
-
-erver
+mtp
-      :address        => "localhost", 
-      :port           => 25, 
@@ -237 +239 @@
-      :authentication => nil
-    }
-
+
+
+
+
+
+
+
-
-    @@raise_delivery_errors = true
@@ -550 +558 @@
-
-      def perform_delivery_sendmail(mail)
-/usr/sbin/sendmail -i -t
+#{sendmail_settings[:location]} #{sendmail_settings[:arguments]}
-          sm.print(mail.encoded.gsub(/\r/, ''))
-          sm.flush