whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sam Ruby <ru...@apache.org>
Subject [whimsy.git] [1/1] Commit 34d4e7a: give gpg a work directory
Date Mon, 11 Jan 2016 17:22:43 GMT
Commit 34d4e7a901c9e88f68cef006304044e11c942678:
    give gpg a work directory


Branch: refs/heads/master
Author: Sam Ruby <rubys@intertwingly.net>
Committer: Sam Ruby <rubys@intertwingly.net>
Pusher: rubys <rubys@apache.org>

------------------------------------------------------------
www/secmail/config.rb                                        | +++++ 
www/secmail/views/actions/check-signature.json.rb            | ++ 
------------------------------------------------------------
7 changes: 7 additions, 0 deletions.
------------------------------------------------------------


diff --git a/www/secmail/config.rb b/www/secmail/config.rb
index 2e83339..2b1aa87 100644
--- a/www/secmail/config.rb
+++ b/www/secmail/config.rb
@@ -10,3 +10,8 @@
 
 ARCHIVE = (Dir.exist?('/srv/mail') ? '/srv/mail' : File.basename(SOURCE))
 
+#
+# GPG's work directory override
+#
+
+GNUPGHOME = (Dir.exist?('/srv/gpg') ? '/srv/gpg' : nil)
diff --git a/www/secmail/views/actions/check-signature.json.rb b/www/secmail/views/actions/check-signature.json.rb
index ab96bd5..5d7d4d5 100644
--- a/www/secmail/views/actions/check-signature.json.rb
+++ b/www/secmail/views/actions/check-signature.json.rb
@@ -2,6 +2,8 @@
 # check signature on an attachment
 #
 
+ENV['GNUPGHOME'] = GNUPGHOME if GNUPGHOME
+
 message = Mailbox.find(@message)
 
 begin

Mime
View raw message