1 files changed, 41 insertions, 25 deletions

diff --git a/rt/etc/RT_Config.pm b/rt/etc/RT_Config.pm
index 1b7e756c5..b4ca44c96 100644
--- a/rt/etc/RT_Config.pm
+++ b/rt/etc/RT_Config.pm
@@ -104,7 +104,7 @@ Valid types are "mysql", "Oracle" and "Pg"
 
 =cut
 
-Set($DatabaseType , 'mysql');
+Set($DatabaseType , 'Pg');
 
 =item C<$DatabaseHost>, C<$DatabaseRTHost>
 
@@ -133,7 +133,7 @@ The name of the database user (inside the database)
 
 =cut
 
-Set($DatabaseUser , 'rt_user');
+Set($DatabaseUser , 'freeside');
 
 =item C<$DatabasePassword>
 
@@ -141,7 +141,7 @@ Password the C<$DatabaseUser> should use to access the database
 
 =cut
 
-Set($DatabasePassword , 'rt_pass');
+Set($DatabasePassword , '');
 
 =item C<$DatabaseName>
 
@@ -150,7 +150,7 @@ it's SID, DB objects are created in L<$DatabaseUser>'s schema.
 
 =cut
 
-Set($DatabaseName , 'rt3');
+Set($DatabaseName , 'freeside');
 
 =item C<$DatabaseRequireSSL>
 
@@ -293,6 +293,17 @@ can generate a naive first pass regexp by using
 
 Set($RTAddressRegexp , undef);
 
+=item C<$IgnoreCcRegexp>
+
+C<$IgnoreCcRegexp> is a regexp to exclude addresses from automatic addition 
+to the Cc list.  Use this for addresses that are I<not> received by RT but
+are sometimes added to Cc lists by mistake.  Unlike C<$RTAddressRegexp>, 
+these addresses can still receive email from RT otherwise.
+
+=cut
+
+Set($IgnoreCcRegexp, undef);
+
 =item C<$CanonicalizeEmailAddressMatch>, C<$CanonicalizeEmailAddressReplace>
 
 RT provides functionality which allows the system to rewrite
@@ -330,6 +341,18 @@ made of multiple email adresses.
 
 Set($ValidateUserEmailAddresses, undef);
 
+=item C<$NonCustomerEmailRegexp>
+
+Normally, when a ticket is linked to a customer, any requestors on that
+ticket that didn't previously have customer memberships are linked to 
+the customer also.  C<$NonCustomerEmailRegexp> is a regexp for email 
+addresses that should I<not> automatically be linked to a customer in 
+this way.
+
+=cut
+
+Set($NonCustomerEmailRegexp, undef);
+
 =item C<@MailPlugins>
 
 C<@MailPlugins> is a list of auth plugins for L<RT::Interface::Email>
@@ -733,7 +756,7 @@ NOTE that options with '-' character MUST be quoted.
 =cut
 
 Set(%GnuPGOptions,
-    homedir => 'var/data/gpg',
+    homedir => '/opt/rt3/var/data/gpg',
 
 # URL of a keyserver
 #    keyserver => 'hkp://subkeys.pgp.net',
@@ -787,7 +810,7 @@ direct file logging.
 =cut
 
 Set($LogToFile      , undef);
-Set($LogDir, 'var/log');
+Set($LogDir, '/opt/rt3/var/log');
 Set($LogToFileNamed , "rt.log");    #log to rt.log
 
 =item C<$LogStackTraces>
@@ -841,6 +864,9 @@ RT ships with several themes by default:
   3.4-compat      A 3.4 compatibility stylesheet to make RT look
                   (mostly) like 3.4
 
+This bundled distibution of RT also includes (enabled by default):
+  freeside2.1     Integration with Freeside
+
 This value actually specifies a directory in F<share/html/NoAuth/css/>
 from which RT will try to load the file main.css (which should
 @import any other files the stylesheet needs).  This allows you to
@@ -849,7 +875,7 @@ option can be overridden by users in their preferences.
 
 =cut
 
-Set($WebDefaultStylesheet, 'web2');
+Set($WebDefaultStylesheet, 'freeside2.1');
 
 =item C<$UsernameFormat>
 
@@ -860,7 +886,7 @@ EmailAddress.
 
 =cut
 
-Set($UsernameFormat, 'concise');
+Set($UsernameFormat, 'verbose');
 
 =item C<$WebDomain>
 
@@ -982,7 +1008,7 @@ login if you change it.
 
 =cut
 
-Set($WebNoAuthRegex, qr{^ (?:/+NoAuth/ | /+REST/\d+\.\d+/NoAuth/) }x );
+Set($WebNoAuthRegex, qr{^ /rt (?:/+NoAuth/ | /+REST/\d+\.\d+/NoAuth/) }x );
 
 =item C<$SelfServiceRegex>
 
@@ -1235,19 +1261,6 @@ via SSL encrypted HTTP connections.
 
 Set($WebSecureCookies, 0);
 
-=item C<$WebHttpOnlyCookies>
-
-Default RT's session cookie to not being directly accessible to
-javascript.  The content is still sent during regular and AJAX requests,
-and other cookies are unaffected, but the session-id is less
-programmatically accessible to javascript.  Turning this off should only
-be necessary in situations with odd client-side authentication
-requirements.
-
-=cut
-
-Set($WebHttpOnlyCookies, 1);
-
 =item C<$WebFlushDbCacheEveryRequest>
 
 By default, RT clears its database cache after every page view.
@@ -1384,7 +1397,7 @@ customized homepage ("RT at a glance").
 
 =cut
 
-Set($HomepageComponents, [qw(QuickCreate Quicksearch MyAdminQueues MySupportQueues MyReminders RefreshHomepage Dashboards)]);
+Set($HomepageComponents, [qw(QuickCreate Quicksearch MyCalendar MyAdminQueues MySupportQueues MyReminders RefreshHomepage Dashboards)]);
 
 =item C<@MasonParameters>
 
@@ -1408,6 +1421,7 @@ C<$DefaultSearchResultFormat> is the default format for RT search results
 Set ($DefaultSearchResultFormat, qq{
    '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
    '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+   Customer,
    Status,
    QueueName, 
    OwnerName, 
@@ -1415,6 +1429,7 @@ Set ($DefaultSearchResultFormat, qq{
    '__NEWLINE__',
    '', 
    '<small>__Requestors__</small>',
+   '<small>__CustomerTags__</small>',
    '<small>__CreatedRelative__</small>',
    '<small>__ToldRelative__</small>',
    '<small>__LastUpdatedRelative__</small>',
@@ -1786,7 +1801,7 @@ custom field values from external sources at runtime.
 
 =cut
 
-Set(@CustomFieldValuesSources, ());
+Set(@CustomFieldValuesSources, ('RT::CustomFieldValues::Queues'));
 
 =item C<$CanonicalizeRedirectURLs>
 
@@ -1818,7 +1833,8 @@ C<Set(@Plugins, (qw(Extension::QuickDelete RT::FM)));>
 
 =cut
 
-Set(@Plugins, ());
+Set(@Plugins, (qw(RTx::Calendar
+                  RT::Extension::MobileUI))); #RTx::Checklist ));
 
 =back