[Rt-commit] r19951 - in rt/3.999/trunk: lib lib/RT

[sartak at bestpractical.com]

Author: sartak
Date: Mon Jun  8 15:25:06 2009
New Revision: 19951

Modified:
   rt/3.999/trunk/lib/RT.pm
   rt/3.999/trunk/lib/RT/Bootstrap.pm
   rt/3.999/trunk/sbin/rt-setup-database

Log:
RT->etc_path

Modified: rt/3.999/trunk/lib/RT.pm
==============================================================================
--- rt/3.999/trunk/lib/RT.pm	(original)
+++ rt/3.999/trunk/lib/RT.pm	Mon Jun  8 15:25:06 2009
@@ -387,6 +387,14 @@
 
 sub local_html_path { Jifty::Util->app_root . '/local/html' }
 
+=head2 etc_path
+
+The root of F</etc> (configuration)
+
+=cut
+
+sub etc_path { Jifty::Util->app_root . '/etc' }
+
 =head1 BUGS
 
 Please report them to C<rt-bugs at bestpractical.com>, if you know what's

Modified: rt/3.999/trunk/lib/RT/Bootstrap.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Bootstrap.pm	(original)
+++ rt/3.999/trunk/lib/RT/Bootstrap.pm	Mon Jun  8 15:25:06 2009
@@ -56,7 +56,7 @@
 
 
     $self->insert_initial_data();
-    $self->insert_data( Jifty::Util->app_root . "/etc/initialdata" );
+    $self->insert_data( RT->etc_path . "/initialdata" );
 }
 
 use File::Spec;

Modified: rt/3.999/trunk/sbin/rt-setup-database
==============================================================================
--- rt/3.999/trunk/sbin/rt-setup-database	(original)
+++ rt/3.999/trunk/sbin/rt-setup-database	Mon Jun  8 15:25:06 2009
@@ -98,7 +98,7 @@
 # convert init to multiple actions
 if ( $actions[0] eq 'init' ) {
     @actions = qw(create schema acl insert);
-    $args{'datafile'} ||= Jifty::Util->app_root . "/etc/initialdata";
+    $args{'datafile'} ||= RT->etc_path . "/initialdata";
 }
 
 # set options from environment