[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.6-352-gd5721a6

Kevin Falcone falcone at bestpractical.com
Fri Dec 3 16:32:04 EST 2010


The branch, 3.9-trunk has been updated
       via  d5721a62f65dfd8081c4235cfb582ff3dcf0234f (commit)
       via  e0da82a6ee54f8cdb9e254c7722258972f2ee415 (commit)
       via  240a0dbbce3a0e1e50962106e2a2540a13ab6de2 (commit)
       via  856426b2a0489a7fc1d098f6d7bc92a8d6112ffb (commit)
       via  f22ed8e6abde5b771232993ad41565fd877587cb (commit)
      from  3287035d095e4b4174ee65b59b65cd44099c69d4 (commit)

Summary of changes:
 Makefile.in                                  |    4 -
 README                                       |   20 +++---
 UPGRADING                                    |   14 ++--
 bin/rt-mailgate.in                           |    6 +-
 bin/rt.in                                    |    4 +-
 config.layout                                |    6 +-
 configure.ac                                 |    4 +-
 docs/web_deployment.pod                      |   40 ++++++------
 lib/RT/Crypt/GnuPG.pm                        |    2 +-
 lib/RT/Interface/Email/Auth/GnuPG.pm         |    2 +-
 lib/RT/Test.pm                               |    2 +-
 sbin/rt-email-dashboards.in                  |    2 +-
 share/html/Admin/Elements/ObjectCustomFields |   96 --------------------------
 share/html/Admin/Groups/CustomFields.html    |   48 -------------
 14 files changed, 51 insertions(+), 199 deletions(-)
 delete mode 100644 share/html/Admin/Elements/ObjectCustomFields
 delete mode 100644 share/html/Admin/Groups/CustomFields.html

- Log -----------------------------------------------------------------
commit f22ed8e6abde5b771232993ad41565fd877587cb
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Nov 22 21:46:26 2010 -0500

    Remove an unused file (Elements/OCFS) and the one unreachable file which
    points to it

diff --git a/share/html/Admin/Elements/ObjectCustomFields b/share/html/Admin/Elements/ObjectCustomFields
deleted file mode 100644
index 92402e4..0000000
--- a/share/html/Admin/Elements/ObjectCustomFields
+++ /dev/null
@@ -1,96 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
-%#                                          <jesse at bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title &>
-<& /Elements/Tabs &>
-
-<& /Admin/Elements/EditCustomFields, %ARGS, title => $title, Object => $Object &>
-<%INIT>
-# XXX TODO: Validate here?
-#$ObjectType =~ /^RT::(Queue|User|Group)$/
-#    or Abort(loc("Object of type [_1] cannot take custom fields", $ObjectType), SuppressHeader => 1);
-
-
-
-my $Type = $1;
-my $Types = $Type.'s';
-my $Object = $ObjectType->new($session{'CurrentUser'});
-
-
-my $QualifiedType;
-my $FriendlySubTypes;
-if (defined $SubType && $SubType =~/^RT::(.*)$/)  {
-    $FriendlySubTypes = RT::CustomField->new($session{'CurrentUser'})->FriendlyLookupType($Object->CustomFieldLookupType);
-   $QualifiedType = "$Type-$1"; 
-} else {
-    $QualifiedType = $Type;
-}
-
-if ($id) { 
-    $Object->Load($id) || Abort(loc("Couldn't load object [_1]", $id), SuppressHeader => 1);
-} 
-
-my $title; 
-if ($id) {
-$title =  loc('Edit Custom Fields for [_1]', $Object->Name);
-}
-elsif ($SubType) {
-
-    $title=   loc("Modify Custom Fields which apply to [_1] for all [_2]", loc(lc($FriendlySubTypes)), loc(lc($Types)));
-} else {
- $title =loc("Modify Custom Fields which apply to all [_1]", loc(lc($Types)));
-
-}
-my $sub_type_url;
-$sub_type_url = "SubType=$SubType" if $SubType;
-
-</%INIT>
-<%ARGS>
-$id => undef
-$ObjectType
-$SubType => undef
-</%ARGS>
diff --git a/share/html/Admin/Groups/CustomFields.html b/share/html/Admin/Groups/CustomFields.html
deleted file mode 100644
index 31ca9bd..0000000
--- a/share/html/Admin/Groups/CustomFields.html
+++ /dev/null
@@ -1,48 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
-%#                                          <jesse at bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/ObjectCustomFields, %ARGS, ObjectType => 'RT::Group' &>

commit 856426b2a0489a7fc1d098f6d7bc92a8d6112ffb
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Nov 22 17:11:37 2010 -0500

    Start installing into /opt/rt4 by default

diff --git a/README b/README
index 8bcca3f..ef64fd2 100644
--- a/README
+++ b/README
@@ -66,10 +66,10 @@ want to read a more comprehensive installation guide at:
        ./configure --help to see the list of options
        ./configure (with the flags you want)
 
-    RT defaults to installing in /opt/rt3 with MySQL as its database. It
+    RT defaults to installing in /opt/rt4 with MySQL as its database. It
     tries to guess which of www-data, www, apache or nobody your webserver
     will run as, but you can override that behavior.  Note that the
-    default install directory in /opt/rt3 does not work under SELinux's
+    default install directory in /opt/rt4 does not work under SELinux's
     default configuration.
 
     If you're upgrading RT then it is worth reading the UPGRADING document at
@@ -148,11 +148,11 @@ want to read a more comprehensive installation guide at:
 
      You should back up your database before running this command.
 
-       /opt/rt3/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
+       /opt/rt4/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
 
      Clear mason cache dir:
 
-       rm -fr /opt/rt3/var/mason_data/obj
+       rm -fr /opt/rt4/var/mason_data/obj
 
      Stop and start web-server.
 
@@ -183,9 +183,9 @@ want to read a more comprehensive installation guide at:
 
         crontab -e    # as the RT administrator (probably root)
         # insert the following lines:
-        0 0 * * * /opt/rt3/sbin/rt-email-digest -m daily
-        0 0 * * 0 /opt/rt3/sbin/rt-email-digest -m weekly
-        0 * * * * /opt/rt3/sbin/rt-email-dashboards
+        0 0 * * * /opt/rt4/sbin/rt-email-digest -m daily
+        0 0 * * 0 /opt/rt4/sbin/rt-email-digest -m weekly
+        0 * * * * /opt/rt4/sbin/rt-email-dashboards
 
 
 11   Set up users, groups, queues, scrips and access control.
@@ -208,14 +208,14 @@ incoming email messages from your mail server to RT.
 
 Add the following lines to /etc/aliases (or your local equivalent) on your mail server:
 
-rt:         "|/opt/rt3/bin/rt-mailgate --queue general --action correspond --url http://rt.example.com/"
-rt-comment: "|/opt/rt3/bin/rt-mailgate --queue general --action comment --url http://rt.example.com/"
+rt:         "|/opt/rt4/bin/rt-mailgate --queue general --action correspond --url http://rt.example.com/"
+rt-comment: "|/opt/rt4/bin/rt-mailgate --queue general --action comment --url http://rt.example.com/"
 
 You'll need to add similar lines for each queue you want to be able
 to send email to. To find out more about how to configure RT's email
 gateway, type:
 
-       perldoc /opt/rt3/bin/rt-mailgate
+       perldoc /opt/rt4/bin/rt-mailgate
 
 
 
diff --git a/UPGRADING b/UPGRADING
index 686b089..df5c70f 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -43,7 +43,7 @@ with
   interface (rights management, subgroup membership) may not work as expected
   with duplicate names.  Running
 
-    /opt/rt3/sbin/rt-validator --check
+    /opt/rt4/sbin/rt-validator --check
 
   will report duplicate group names, and running it with --resolve will fix
   duplicates by appending the group id to the name.
@@ -59,7 +59,7 @@ We've proved that it's possible to delete set of records
 from Transactions table without losing functionality. To delete
 record run the following script:
 
-    perl -I /opt/rt3/local/lib -I /opt/rt3/lib etc/upgrade/shrink_transactions_table.pl
+    perl -I /opt/rt4/local/lib -I /opt/rt4/lib etc/upgrade/shrink_transactions_table.pl
 
 The default for $MessageBoxWrap is now SOFT and $MessageBoxWidth is now unset
 by default.  This means the message box will expand to fill all the available
@@ -85,7 +85,7 @@ custom field orders.
 RT will automatically clean up your existing custom fields when you run:
 
 
-  /opt/rt3/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
+  /opt/rt4/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
 
 After that cleanup, you should make sure that custom fields are ordered in
 a way that you and your users find pleasing.
@@ -106,7 +106,7 @@ You can now forward an entire Ticket history (in addition to specific transactio
 but this requires a new Template called forward ticket.  This template will be added
 when you run.
 
-/opt/rt3/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
+/opt/rt4/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
 
 Custom fields with categories can optionally be split out into
 hierarchical custom fields.  If you wish to convert your old
@@ -129,7 +129,7 @@ UPGRADING FROM 3.8.3 and earlier - Changes:
 Arguments to the NotifyGroup Scrip Action need
 to be corrected in the database using 
 
-/opt/rt3/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
+/opt/rt4/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
 
 
 UPGRADING FROM 3.8.2 and earlier - Changes:
@@ -178,7 +178,7 @@ We've proved that it's possible to delete pretty big set of records
 from CachedGroupMembers table without losing functionality. To delete
 record run the following script:
 
-    perl -I /opt/rt3/local/lib -I /opt/rt3/lib etc/upgrade/shrink_cgm_table.pl
+    perl -I /opt/rt4/local/lib -I /opt/rt4/lib etc/upgrade/shrink_cgm_table.pl
 
 UPGRADING FROM 3.7.81 and earlier - Changes:
 
@@ -278,7 +278,7 @@ UPGRADING FROM 3.0.x - Changes:
 
 = Installation =
 
-We recommend you move your existing /opt/rt3 tree completely out
+We recommend you move your existing /opt/rt4 tree completely out
 of the way before installing the new version of RT, to make sure
 that you don't inadvertently leave old files hanging around.
 
diff --git a/config.layout b/config.layout
index a7683b5..e0b1e7e 100755
--- a/config.layout
+++ b/config.layout
@@ -17,7 +17,7 @@
 
 #   Default RT3 path layout.
 <Layout RT3>
-  prefix:		/opt/rt3
+  prefix:		/opt/rt4
   exec_prefix:		${prefix}
   bindir:		${exec_prefix}/bin
   sbindir:		${exec_prefix}/sbin
@@ -177,7 +177,7 @@
 
 
 <Layout relative>
-  prefix:		/opt/rt3
+  prefix:		/opt/rt4
   exec_prefix:		${prefix}
   bindir:		bin
   sbindir:		sbin
@@ -202,7 +202,7 @@
   customplugindir:  ${customdir}/plugins
 </Layout>
 <Layout vessel>
-  prefix:		/opt/rt3
+  prefix:		/opt/rt4
   exec_prefix:		${prefix}
   bindir:		bin
   sbindir:		sbin
diff --git a/configure.ac b/configure.ac
index 90d11b5..b5e0b50 100755
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ fi
 AC_SUBST(WEB_HANDLER)
 
 dnl Defaults paths for installation
-AC_PREFIX_DEFAULT([/opt/rt3])
+AC_PREFIX_DEFAULT([/opt/rt4])
 RT_ENABLE_LAYOUT
 
 
diff --git a/docs/web_deployment.pod b/docs/web_deployment.pod
index 828a364..26a81c3 100644
--- a/docs/web_deployment.pod
+++ b/docs/web_deployment.pod
@@ -15,12 +15,12 @@ because that requires root-level privileges and may conflict with any existing
 listeners. So choose a high port (for example 8080) and start the standalone
 server with:
 
-    /opt/rt3/sbin/rt-server --port 8080
+    /opt/rt4/sbin/rt-server --port 8080
 
 You can also run C<rt-server> with any other PSGI server, for example,
 to use L<Starman>, a high performance preforking server:
 
-    /opt/rt3/sbin/rt-server --server Starman --port 8080
+    /opt/rt4/sbin/rt-server --server Starman --port 8080
 
 =head2 mod_perl
 
@@ -58,8 +58,8 @@ it knows where to find RT:
         PerlModule Apache::DBI
 
         # optional apache logs for RT
-        # ErrorLog /opt/rt3/var/log/apache.error
-        # TransferLog /opt/rt3/var/log/apache.access
+        # ErrorLog /opt/rt4/var/log/apache.error
+        # TransferLog /opt/rt4/var/log/apache.access
         # LogLevel debug
 
         <Directory />
@@ -70,18 +70,18 @@ it knows where to find RT:
         </Directory>
 
         AddDefaultCharset UTF-8
-        PerlSetEnv RT_SITE_CONFIG /opt/rt3/etc/RT_SiteConfig.pm
+        PerlSetEnv RT_SITE_CONFIG /opt/rt4/etc/RT_SiteConfig.pm
 
         RedirectMatch permanent (.*)/$ $1/index.html
 
-        DocumentRoot "/opt/rt3/share/html"
-        <Directory "/opt/rt3/share/html">
+        DocumentRoot "/opt/rt4/share/html"
+        <Directory "/opt/rt4/share/html">
             Order allow,deny
             Allow from all
 
             SetHandler perl-script
             PerlHandler Plack::Handler::Apache1
-            PerlSetVar psgi_app /opt/rt3/sbin/rt-server
+            PerlSetVar psgi_app /opt/rt4/sbin/rt-server
         </Directory>
     </VirtualHost>
 
@@ -109,8 +109,8 @@ it knows where to find RT:
         LoadModule perl_module modules/mod_perl.so
 
         # optional apache logs for RT
-        # ErrorLog /opt/rt3/var/log/apache2.error
-        # TransferLog /opt/rt3/var/log/apache2.access
+        # ErrorLog /opt/rt4/var/log/apache2.error
+        # TransferLog /opt/rt4/var/log/apache2.access
         # LogLevel debug
 
         <Directory />
@@ -121,18 +121,18 @@ it knows where to find RT:
         </Directory>
 
         AddDefaultCharset UTF-8
-        PerlSetEnv RT_SITE_CONFIG /opt/rt3/etc/RT_SiteConfig.pm
+        PerlSetEnv RT_SITE_CONFIG /opt/rt4/etc/RT_SiteConfig.pm
 
         RedirectMatch permanent (.*)/$ $1/index.html
 
-        DocumentRoot "/opt/rt3/share/html"
-        <Directory "/opt/rt3/share/html">
+        DocumentRoot "/opt/rt4/share/html"
+        <Directory "/opt/rt4/share/html">
             Order allow,deny
             Allow from all
 
             SetHandler perl-script
             PerlResponseHandler Plack::Handler::Apache2
-            PerlSetVar psgi_app /opt/rt3/sbin/rt-server
+            PerlSetVar psgi_app /opt/rt4/sbin/rt-server
         </Directory>
     </VirtualHost>
 
@@ -154,7 +154,7 @@ Apache configuration file telling it about RT:
     # Tell FastCGI to put its temporary files somewhere sane.
     FastCgiIpcDir /tmp
 
-    FastCgiServer /opt/rt3/sbin/rt-server.fcgi -processes 1 -idle-timeout 180 -initial-env RT_SITE_CONFIG=/opt/rt3/etc/RT_SiteConfig.pm
+    FastCgiServer /opt/rt4/sbin/rt-server.fcgi -processes 1 -idle-timeout 180 -initial-env RT_SITE_CONFIG=/opt/rt4/etc/RT_SiteConfig.pm
 
     <IfModule !mpm_netware_module>
     <IfModule !mpm_winnt_module>
@@ -174,8 +174,8 @@ Apache configuration file telling it about RT:
         LoadModule fastcgi_module modules/mod_fastcgi.so
 
         # optional apache logs for RT
-        # ErrorLog /opt/rt3/var/log/apache2.error
-        # TransferLog /opt/rt3/var/log/apache2.access
+        # ErrorLog /opt/rt4/var/log/apache2.error
+        # TransferLog /opt/rt4/var/log/apache2.access
         # LogLevel debug
 
         <Directory />
@@ -187,10 +187,10 @@ Apache configuration file telling it about RT:
 
         AddDefaultCharset UTF-8
 
-        Alias /NoAuth/images/ /opt/rt3/share/html/NoAuth/images/
-        ScriptAlias / /opt/rt3/sbin/rt-server.fcgi/
+        Alias /NoAuth/images/ /opt/rt4/share/html/NoAuth/images/
+        ScriptAlias / /opt/rt4/sbin/rt-server.fcgi/
 
-        DocumentRoot "/opt/rt3/share/html"
+        DocumentRoot "/opt/rt4/share/html"
         <Location />
             Order allow,deny
             Allow from all

commit 240a0dbbce3a0e1e50962106e2a2540a13ab6de2
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Dec 3 16:07:16 2010 -0500

    Remove unused make target

diff --git a/Makefile.in b/Makefile.in
index 14517ba..caf9d57 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -352,10 +352,6 @@ parallel-test: test-parallel
 test-parallel: 
 	RT_TEST_PARALLEL=1 $(PERL) "-MApp::Prove" -e 'my $$p = App::Prove->new(); $$p->process_args("-lrj5","--state=slow,save", "t"); $$p->run()'
 
-regression-install: config-install
-	$(PERL) -pi -e 's/Set\(\$$DatabaseName.*\);/Set\(\$$DatabaseName, "rt3regression"\);/' $(DESTDIR)$(CONFIG_FILE)
-
-
 regression-reset-db: force-dropdb
 	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
 

commit e0da82a6ee54f8cdb9e254c7722258972f2ee415
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Dec 3 16:12:11 2010 -0500

    Rename our default database to rt4

diff --git a/configure.ac b/configure.ac
index b5e0b50..85fddd7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,7 @@ AC_ARG_WITH(db-database,
 	    AC_HELP_STRING([--with-db-database=DBNAME],
 	    		   [name of the database to use (default: rt3)]),
             DB_DATABASE=$withval,
-            DB_DATABASE=rt3)
+            DB_DATABASE=rt4)
 AC_SUBST(DB_DATABASE)
 
 dnl DB_RT_USER
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 9832392..1277b04 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -110,7 +110,7 @@ sub generate_port {
 
 BEGIN {
     $port   = generate_port();
-    $dbname = $ENV{RT_TEST_PARALLEL}? "rt3test_$port" : "rt3test";
+    $dbname = $ENV{RT_TEST_PARALLEL}? "rt4test_$port" : "rt4test";
 };
 
 sub import {

commit d5721a62f65dfd8081c4235cfb582ff3dcf0234f
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Dec 3 16:15:33 2010 -0500

    clean up rt3 references

diff --git a/bin/rt-mailgate.in b/bin/rt-mailgate.in
index 9d994c7..74d0a03 100755
--- a/bin/rt-mailgate.in
+++ b/bin/rt-mailgate.in
@@ -48,7 +48,7 @@
 # END BPS TAGGED BLOCK }}}
 =head1 NAME
 
-rt-mailgate - Mail interface to RT3.
+rt-mailgate - Mail interface to RT.
 
 =cut
 
@@ -396,10 +396,10 @@ Next, you need to route mail to C<rt-mailgate> for the queues you're
 monitoring. For instance, if you're using F</etc/aliases> and you have a
 "bugs" queue, you will want something like this:
 
-    bugs:         "|/opt/rt3/bin/rt-mailgate --queue bugs --action correspond
+    bugs:         "|/opt/rt4/bin/rt-mailgate --queue bugs --action correspond
               --url http://rt.mycorp.com/"
 
-    bugs-comment: "|/opt/rt3/bin/rt-mailgate --queue bugs --action comment
+    bugs-comment: "|/opt/rt4/bin/rt-mailgate --queue bugs --action comment
               --url http://rt.mycorp.com/"
 
 Note that you don't have to run your RT server on your mail server, as
diff --git a/bin/rt.in b/bin/rt.in
index 15b46d6..6036f67 100755
--- a/bin/rt.in
+++ b/bin/rt.in
@@ -2168,7 +2168,7 @@ Text:
     ("ls", "list", and "search" are synonyms.)
 
     Conditions are expressed in the SQL-like syntax used internally by
-    RT3. (For more information, see "rt help query".) The query string
+    RT. (For more information, see "rt help query".) The query string
     must be supplied as one argument.
 
     (Right now, the server doesn't support listing anything but tickets.
@@ -2401,7 +2401,7 @@ Text:
 Title: query
 Text:
 
-    RT3 uses an SQL-like syntax to specify object selection constraints.
+    RT uses an SQL-like syntax to specify object selection constraints.
     See the <RT:...> documentation for details.
     
     (XXX: I'm going to have to write it, aren't I?)
diff --git a/lib/RT/Crypt/GnuPG.pm b/lib/RT/Crypt/GnuPG.pm
index 5f1aa91..cc82d0b 100644
--- a/lib/RT/Crypt/GnuPG.pm
+++ b/lib/RT/Crypt/GnuPG.pm
@@ -168,7 +168,7 @@ quoted, otherwise you can see quite cryptic error 'gpg: Invalid option "--0"'.
 
 =item --homedir
 
-The GnuPG home directory, by default it is set to F</opt/rt3/var/data/gpg>.
+The GnuPG home directory, by default it is set to F</opt/rt4/var/data/gpg>.
 
 You can manage this data with the 'gpg' commandline utility 
 using the GNUPGHOME environment variable or --homedir option. 
diff --git a/lib/RT/Interface/Email/Auth/GnuPG.pm b/lib/RT/Interface/Email/Auth/GnuPG.pm
index 2248712..cfeb9de 100644
--- a/lib/RT/Interface/Email/Auth/GnuPG.pm
+++ b/lib/RT/Interface/Email/Auth/GnuPG.pm
@@ -58,7 +58,7 @@ To use the gnupg-secured mail gateway, you need to do the following:
 Set up a GnuPG key directory with a pubring containing only the keys
 you care about and specify the following in your SiteConfig.pm
 
-    Set(%GnuPGOptions, homedir => '/opt/rt3/var/data/GnuPG');
+    Set(%GnuPGOptions, homedir => '/opt/rt4/var/data/GnuPG');
     Set(@MailPlugins, 'Auth::MailFrom', 'Auth::GnuPG', ...other filter...);
 
 =cut
diff --git a/sbin/rt-email-dashboards.in b/sbin/rt-email-dashboards.in
index 84527cd..3047dc9 100644
--- a/sbin/rt-email-dashboards.in
+++ b/sbin/rt-email-dashboards.in
@@ -130,7 +130,7 @@ are taken to be in the user's timezone if available, UTC otherwise.
 You'll need to have cron run this script every hour. Here's an example crontab
 entry to do this.
 
-    0 * * * * @PERL@ /opt/rt3/local/sbin/rt-email-dashboards
+    0 * * * * @PERL@ /opt/rt4/local/sbin/rt-email-dashboards
 
 This will run the script every hour on the hour. This may need some further
 tweaking to be run as the correct user.

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


More information about the Rt-commit mailing list