[whimsy] 02/02: eliminate dead code

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

commit 485ffd07496b80236bfc2bb76658509687475c15
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Aug 23 18:43:29 2016 -0400

    eliminate dead code
---
 www/secretary/workbench/file.cgi        | 4 ++--
 www/secretary/workbench/local_paths.yml | 1 -
 www/secretary/workbench/secmail.rb      | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/www/secretary/workbench/file.cgi b/www/secretary/workbench/file.cgi
index e58e7bc..d457f01 100755
--- a/www/secretary/workbench/file.cgi
+++ b/www/secretary/workbench/file.cgi
@@ -208,7 +208,7 @@ end
 def send_email(target, message)
   pending = YAML.load(open(PENDING_YML))
 
-  require MAIL if defined?(MAIL)
+  require_relative 'secmail'
   require 'erb'
 
   mails = []
@@ -227,7 +227,7 @@ def send_email(target, message)
     # send email, if template exists
     template = vars.doctype + '.erb'
     template.taint unless template =~ /^\w[.\w]+$/
-    if defined?(MAIL) and File.exist?(template)
+    if File.exist?(template)
       # prepare to send mail
       ASF::Mail.configure
 
diff --git a/www/secretary/workbench/local_paths.yml b/www/secretary/workbench/local_paths.yml
index f2dde3f..2539914 100644
--- a/www/secretary/workbench/local_paths.yml
+++ b/www/secretary/workbench/local_paths.yml
@@ -3,5 +3,4 @@ foundation: /srv/secretary/workbench/foundation
 officers:   /srv/secretary/workbench/foundation/officers
 documents:  /srv/secretary/workbench/documents
 received:   /srv/secretary/workbench/documents/received
-mail:       /srv/secretary/workbench/secmail.rb
 subreq:     /srv/secretary/workbench/subreq
diff --git a/www/secretary/workbench/secmail.rb b/www/secretary/workbench/secmail.rb
index fad0b38..4aaae6b 100644
--- a/www/secretary/workbench/secmail.rb
+++ b/www/secretary/workbench/secmail.rb
@@ -1,8 +1,6 @@
 require 'mail'
 
 Mail.defaults do
-  delivery_method :sendmail
-
   if $USER == 'clr'
 
     @from = 'Craig L Russell <cl...@apache.org>'
@@ -52,5 +50,3 @@ Mail.defaults do
     }
   end
 end
-
-

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.