[Jifty-commit] r858 - jifty/trunk/lib/Jifty

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Thu Apr 13 04:01:02 EDT 2006


Author: autrijus
Date: Thu Apr 13 04:01:02 2006
New Revision: 858

Modified:
   jifty/trunk/lib/Jifty/Config.pm

Log:
* Jifty::Config: when guessing initial config, always use absolute
  path instead of relative ones, as lighttpd does a implicit "chdir"
  into document root, rendering relative paths for e.g. PO files useless.

Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm	(original)
+++ jifty/trunk/lib/Jifty/Config.pm	Thu Apr 13 04:01:02 2006
@@ -208,6 +208,9 @@
     $app_class =~ s/-/::/g;
     my $db_name = lc $app_name;
     $db_name =~ s/-/_/g;
+
+    my $app_root = Jifty::Util->app_root;
+
     return {
         framework => {
             AdminMode        => 1,
@@ -229,15 +232,15 @@
             Mailer     => 'Sendmail',
             MailerArgs => [],
             L10N       => {
-                PoDir => 'share/po',
+                PoDir => "$app_root/share/po",
             },
             Web        => {
                 Port => '8888',
                 BaseURL => 'http://localhost',
-                SessionDir  => "var/session",
-                DataDir     => "var/mason",
-                StaticRoot   => "share/web/static",
-                TemplateRoot => "share/web/templates",
+                SessionDir  => "$app_root/var/session",
+                DataDir     => "$app_root/var/mason",
+                StaticRoot   => "$app_root/share/web/static",
+                TemplateRoot => "$app_root/share/web/templates",
                 ServeStaticFiles => 1,
                 MasonConfig => {
                     autoflush    => 0,


More information about the Jifty-commit mailing list