]>
Commit | Line | Data |
---|---|---|
107aba6f ER |
1 | --- dokuwiki/inc/init.php~ 2009-11-10 15:19:36.000000000 +0200 |
2 | +++ dokuwiki/inc/init.php 2009-11-10 15:19:38.080947917 +0200 | |
0bd9eba3 | 3 | @@ -21,7 +21,10 @@ |
107aba6f | 4 | if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/'); |
c9db9c16 | 5 | |
107aba6f ER |
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/'); | |
0bd9eba3 | 9 | + |
107aba6f ER |
10 | +// define path where variable data is saved (packagers may want to change this to /var/lib/dokuwiki/) |
11 | +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/'); | |
c9db9c16 | 12 | |
107aba6f ER |
13 | // check for error reporting override or set error reporting to sane values |
14 | if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) { | |
982e1b45 ER |
15 | --- dokuwiki-2012-01-25/install.php~ 2012-01-27 09:30:05.000000000 +0200 |
16 | +++ dokuwiki-2012-01-25/install.php 2012-01-27 09:31:55.795792191 +0200 | |
8af44bf3 ER |
17 | @@ -6,8 +6,9 @@ |
18 | */ | |
19 | ||
c9db9c16 | 20 | if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/'); |
8af44bf3 ER |
21 | -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/'); |
22 | -if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/'); | |
23 | +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/'); | |
24 | +if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_CONF); | |
107aba6f | 25 | +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/'); |
8af44bf3 ER |
26 | |
27 | // check for error reporting override or set error reporting to sane values | |
28 | if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); } | |
982e1b45 | 29 | @@ -422,17 +422,17 @@ |
8af44bf3 ER |
30 | |
31 | $dirs = array( | |
982e1b45 ER |
32 | 'conf' => DOKU_LOCAL, |
33 | - 'data' => DOKU_INC.'data', | |
34 | - 'pages' => DOKU_INC.'data/pages', | |
35 | - 'attic' => DOKU_INC.'data/attic', | |
36 | - 'media' => DOKU_INC.'data/media', | |
37 | - 'media_attic' => DOKU_INC.'data/media_attic', | |
38 | - 'media_meta' => DOKU_INC.'data/media_meta', | |
39 | - 'meta' => DOKU_INC.'data/meta', | |
40 | - 'cache' => DOKU_INC.'data/cache', | |
41 | - 'locks' => DOKU_INC.'data/locks', | |
42 | - 'index' => DOKU_INC.'data/index', | |
43 | - 'tmp' => DOKU_INC.'data/tmp' | |
44 | + 'data' => DOKU_DATA, | |
45 | + 'pages' => DOKU_DATA.'pages', | |
46 | + 'attic' => DOKU_DATA.'attic', | |
47 | + 'media' => DOKU_DATA.'media', | |
48 | + 'media_attic' => DOKU_DATA.'media_attic', | |
49 | + 'media_meta' => DOKU_DATA.'media_meta', | |
50 | + 'meta' => DOKU_DATA.'meta', | |
51 | + 'cache' => DOKU_DATA.'cache', | |
52 | + 'locks' => DOKU_DATA.'locks', | |
53 | + 'index' => DOKU_DATA.'index', | |
54 | + 'tmp' => DOKU_DATA.'tmp' | |
8af44bf3 ER |
55 | ); |
56 | ||
57 | $ok = true; |