[Jifty-commit] r874 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Wed Apr 19 22:11:48 2006
New Revision: 874

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Config.pm

Log:
 r12444 at zoq-fot-pik:  chmrr | 2006-04-19 22:11:32 -0400
  * expand relative paths on guessed data


Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm	(original)
+++ jifty/trunk/lib/Jifty/Config.pm	Wed Apr 19 22:11:48 2006
@@ -209,7 +209,7 @@
     my $db_name = lc $app_name;
     $db_name =~ s/-/_/g;
 
-    return {
+    my $guess = {
         framework => {
             AdminMode        => 1,
             DevelMode        => 1,
@@ -235,10 +235,10 @@
             Web        => {
                 Port => '8888',
                 BaseURL => 'http://localhost',
-                SessionDir  => "%var/session%",
-                DataDir     => "%var/mason%",
-                StaticRoot   => "%share/web/static%",
-                TemplateRoot => "%share/web/templates%",
+                SessionDir  => "var/session",
+                DataDir     => "var/mason",
+                StaticRoot   => "share/web/static",
+                TemplateRoot => "share/web/templates",
                 ServeStaticFiles => 1,
                 MasonConfig => {
                     autoflush    => 0,
@@ -251,6 +251,8 @@
         },
     };
 
+    return $self->_expand_relative_paths($guess);
+
 }