Merge branch 'master' of /home/git/private/web.mtrack

diff --git a/index.php b/index.php
index 9000883..cf0715d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,7 +20,6 @@ new HTML_FlexyFramework(array(
     'enable' => 'MTrack,Core,Admin', // enable permissions from Pman 
     'database'        => 'mysql://root:@localhost/pman',
     'version' => '2.0',
-    
     'DB_DataObject' => array(
        //  'debug' => 5,
 
@@ -31,11 +30,11 @@ new HTML_FlexyFramework(array(
         )),
         'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_Core_DataObjects_:',
         
-        'ini_mtrack' => implode(PATH_SEPARATOR, array(
-                dirname(__FILE__). '/Pman/MTrack/DataObjects/pman.ini',
-                dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
-                
-        )),
+        //'ini_mtrack' => implode(PATH_SEPARATOR, array(
+        //        dirname(__FILE__). '/Pman/MTrack/DataObjects/pman.ini',
+        //        dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
+        //        
+        //)),
     ),
     'MTrackWeb' => array(
         'working_dir' => '/var/lib/mtrack', // this needs to be writable by web user..
@@ -52,7 +51,7 @@ new HTML_FlexyFramework(array(
          'useroo' => true,
     ),
      'Pman_Core' => array(
-        'jspacker' => '/home/alan/gitlive/gnome.introspection-doc-generator',
+        'jspacker' => '/home/gitlive/gnome.introspection-doc-generator',
         'cssminify' => dirname(__FILE__).'/roojs1/buildSDK/cssminify.js',
     )
 ));