1 --- dokuwiki/install.php 2007-08-06 21:55:56.000000000 +0300
2 +++ dokuwiki/install.php 2007-08-19 19:35:23.079790781 +0300
6 if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/');
7 -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
8 -if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
9 +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
10 +if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_CONF);
11 +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki');
13 // check for error reporting override or set error reporting to sane values
14 if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
19 - 'data' => DOKU_INC.'data',
20 - 'pages' => DOKU_INC.'data/pages',
21 - 'attic' => DOKU_INC.'data/attic',
22 - 'media' => DOKU_INC.'data/media',
23 - 'meta' => DOKU_INC.'data/meta',
24 - 'cache' => DOKU_INC.'data/cache',
25 - 'locks' => DOKU_INC.'data/locks',
26 - 'index' => DOKU_INC.'data/index',
27 + 'data' => DOKU_DATA,
28 + 'pages' => DOKU_DATA.'/pages',
29 + 'attic' => DOKU_DATA.'/attic',
30 + 'media' => DOKU_DATA.'/media',
31 + 'meta' => DOKU_DATA.'/meta',
32 + 'cache' => DOKU_DATA.'/cache',
33 + 'locks' => DOKU_DATA.'/locks',
34 + 'index' => DOKU_DATA.'/index',
38 --- dokuwiki/inc/init.php~ 2007-06-26 21:27:15.000000000 +0300
39 +++ dokuwiki/inc/init.php 2007-08-19 19:37:26.734809055 +0300
41 if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
43 // define config path (packagers may want to change this to /etc/dokuwiki/)
44 - if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
45 + if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
47 // check for error reporting override or set error reporting to sane values
48 if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {