[Rt-commit] rt branch, 4.2/smime-v2, updated. rt-4.0.4-504-gb48dafb

[Ruslan Zakirov]

The branch, 4.2/smime-v2 has been updated
       via  b48dafb0098d98a0d3ef789d4e65093cb4837a3e (commit)
       via  c5b928dd3ee471e27303a9a364b104600bf4c333 (commit)
       via  501b9c221c3ed5e0be808811a31784f04ff9f252 (commit)
      from  fe4a911426330f4a9a4ab625d8f8e08d45bc34cf (commit)

Summary of changes:
 etc/RT_Config.pm.in      |    3 +--
 share/html/Elements/Tabs |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 501b9c221c3ed5e0be808811a31784f04ff9f252
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Jan 17 18:26:43 2012 +0400

    separate smime keyring dir from gpg's

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index fa7c2ad..8f10ae2 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2067,7 +2067,7 @@ More details in L<RT::Crypt::SMIME>.
 Set( %SMIME,
     Enable => @RT_SMIME@,
     OpenSSL => '/usr/bin/openssl',
-    Keyring => q{@RT_VAR_PATH@/data/gpg},
+    Keyring => q{@RT_VAR_PATH@/data/smime},
     Passphrase => '',
 );
 

commit c5b928dd3ee471e27303a9a364b104600bf4c333
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Jan 17 18:28:53 2012 +0400

    tab was hidden even if GnuPG is enabled
    
    It's just typo in variable we check
    
    Conflicts:
    
    	share/html/Elements/Tabs

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 2c434d3..07d5c51 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -313,7 +313,7 @@ my $build_admin_menu = sub {
                 title => loc('Dashboards in menu'),
                 path  => '/Admin/Users/DashboardsInMenu.html?id=' . $id,
             );
-            if ( RT->Config->Get('GnuPG')->{'enable'} ) {
+            if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
                 $tabs->child( pgp     => title => loc('GnuPG'),          path => "/Admin/Users/GnuPG.html?id=" . $id );
             }
         }

commit b48dafb0098d98a0d3ef789d4e65093cb4837a3e
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Jan 17 19:24:07 2012 +0400

    AllowEncryptDataInDB is in %Crypt now, not %GnuPG

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 8f10ae2..c9d1e89 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2092,7 +2092,6 @@ signatures instead of 'RFC' (GPG/MIME: RFC3156 and RFC1847) format.
 Set(%GnuPG,
     Enable                 => @RT_GPG@,
     OutgoingMessagesFormat => "RFC", # Inline
-    AllowEncryptDataInDB   => 0,
 );
 
 =item C<%GnuPGOptions>

-----------------------------------------------------------------------