]>
Commit | Line | Data |
---|---|---|
c9db9c16 ER |
1 | --- dokuwiki-rc2008-03-31/inc/init.php 2008-03-31 20:11:17.000000000 +0200 |
2 | +++ dokuwiki-rc2008-03-31.new/inc/init.php 2008-04-01 09:44:54.001374243 +0200 | |
3 | @@ -14,7 +14,7 @@ | |
4 | if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/'); | |
5 | ||
6 | // define config path (packagers may want to change this to /etc/dokuwiki/) | |
7 | - if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/'); | |
8 | + if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/'); | |
9 | ||
10 | // check for error reporting override or set error reporting to sane values | |
11 | if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) { | |
12 | --- dokuwiki-rc2008-03-31.new/install.php 2008-04-01 09:44:43.367532550 +0200 | |
13 | +++ dokuwiki-2008-05-05/install.php 2008-05-05 22:20:26.943391311 +0300 | |
8af44bf3 ER |
14 | @@ -6,8 +6,9 @@ |
15 | */ | |
16 | ||
c9db9c16 | 17 | if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/'); |
8af44bf3 ER |
18 | -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/'); |
19 | -if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/'); | |
20 | +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/'); | |
21 | +if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_CONF); | |
22 | +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki'); | |
23 | ||
24 | // check for error reporting override or set error reporting to sane values | |
25 | if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); } | |
c9db9c16 | 26 | @@ -389,15 +390,15 @@ |
8af44bf3 ER |
27 | |
28 | $dirs = array( | |
29 | 'conf' => DOKU_LOCAL, | |
30 | - 'data' => DOKU_INC.'data', | |
31 | - 'pages' => DOKU_INC.'data/pages', | |
32 | - 'attic' => DOKU_INC.'data/attic', | |
33 | - 'media' => DOKU_INC.'data/media', | |
34 | - 'meta' => DOKU_INC.'data/meta', | |
35 | - 'cache' => DOKU_INC.'data/cache', | |
36 | - 'locks' => DOKU_INC.'data/locks', | |
37 | - 'index' => DOKU_INC.'data/index', | |
c9db9c16 | 38 | - 'tmp' => DOKU_INC.'data/tmp' |
8af44bf3 ER |
39 | + 'data' => DOKU_DATA, |
40 | + 'pages' => DOKU_DATA.'/pages', | |
41 | + 'attic' => DOKU_DATA.'/attic', | |
42 | + 'media' => DOKU_DATA.'/media', | |
43 | + 'meta' => DOKU_DATA.'/meta', | |
44 | + 'cache' => DOKU_DATA.'/cache', | |
45 | + 'locks' => DOKU_DATA.'/locks', | |
46 | + 'index' => DOKU_DATA.'/index', | |
c9db9c16 | 47 | + 'tmp' => DOKU_DATA.'/tmp' |
8af44bf3 ER |
48 | ); |
49 | ||
50 | $ok = true; |