lib/whimsy/asf/mail.rb in whimsy-asf-0.0.76 vs lib/whimsy/asf/mail.rb in whimsy-asf-0.0.77

@@ -46,10 +46,34 @@
         )]
       end
 
       public_private ? @lists : @lists.keys
     end
+
+    # common configuration for sending mail
+    def self.configure
+      # fetch overrides
+      sendmail = ASF::Config.get(:sendmail)
+
+      if sendmail
+        # convert string keys to symbols
+        options = Hash[sendmail.map {|key, value| [key.to_sym, value.untaint]}]
+
+        # extract delivery method
+        method = options.delete(:delivery_method).to_sym
+      else
+        # provide defaults that work on whimsy-vm* infrastructure.  Since
+        # procmail is configured with a self-signed certificate, verification
+        # isn't a possibility
+        method = :smtp
+        options = {openssl_verify_mode: 'none'}
+      end
+
+      ::Mail.defaults do
+        delivery_method method, options
+      end
+    end
   end
 
   class Person < Base
     def self.find_by_email(value)
       value.downcase!
@@ -91,10 +115,10 @@
       when 'brand management'
         '[e-mail]'
       when 'executive assistant'
         '[e-mail]'
       when 'legal affairs'
-        '[e-mail]'
+        '[e-mail]'
       when 'marketing and publicity'
         '[e-mail]'
       when 'tac'
         '[e-mail]'
       when 'w3c relations'