You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2016/08/23 22:43:53 UTC
[whimsy] branch master updated (c141664 -> 485ffd0)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git.
from c141664 Change default message to spam
new f2d51ce cleanup install instructions
new 485ffd0 eliminate dead code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
config/secretary-workbench.md | 2 +-
tools/testmail.rb | 8 +++++++-
www/secretary/workbench/file.cgi | 4 ++--
www/secretary/workbench/local_paths.yml | 1 -
www/secretary/workbench/secmail.rb | 4 ----
5 files changed, 10 insertions(+), 9 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 01/02: cleanup install instructions
Posted by 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 f2d51ce07891dedbdcebfc89dfd868741094de62
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Aug 23 18:42:13 2016 -0400
cleanup install instructions
---
config/secretary-workbench.md | 2 +-
tools/testmail.rb | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/config/secretary-workbench.md b/config/secretary-workbench.md
index 42a0503..565e88b 100644
--- a/config/secretary-workbench.md
+++ b/config/secretary-workbench.md
@@ -47,7 +47,7 @@ checkout of `documents/received`.
Run:
```
-$sudo apachectl restart
+$ sudo apachectl restart
```
Install pdftk
diff --git a/tools/testmail.rb b/tools/testmail.rb
index ccef199..3e38571 100644
--- a/tools/testmail.rb
+++ b/tools/testmail.rb
@@ -1,12 +1,18 @@
#
# Test the ability to send email to non-apache.org email addresses
#
+# Should your local user id not match your ASF user id, either specify your
+# ASF user as the first argument to this script, or set the USER environment
+# variable.
+#
+# Note: this will send an email to THAT user.
+#
$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
require 'whimsy/asf'
require 'mail'
require 'etc'
-person = ASF::Person.find(Etc.getlogin)
+person = ASF::Person.find(ARGV.first || ENV['USER'] || Etc.getlogin)
ASF::Mail.configure
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 02/02: eliminate dead code
Posted by 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>.