1 From f835e03e88ba3cb8de941c7cd0862c57afe22da5 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
3 Date: Sun, 24 Jun 2012 12:23:30 +0300
4 Subject: [PATCH] introduce DOKU_DATA and DOKU_CACHE variables for packaging
6 add new constants, that makes packaging (rpm, deb) dokuwiki better fit
7 to [FHS standards](http://www.pathname.com/fhs/pub/fhs-2.3.html):
8 - DOKU_DATA - /var/lib/dokuwiki/
9 - DOKU_CACHE - /var/cache/dokuwiki/
11 Currently upstream is not interested of merging this:
12 https://github.com/splitbrain/dokuwiki/pull/108#issuecomment-6833563
14 inc/init.php | 8 +++++++-
15 install.php | 26 ++++++++++++++------------
16 2 files changed, 21 insertions(+), 13 deletions(-)
18 --- dokuwiki-2018-04-22c.org/inc/init.php 2020-05-01 12:38:20.000000000 +0200
19 +++ dokuwiki-2018-04-22c/inc/init.php 2022-09-27 22:46:28.397714335 +0200
20 @@ -30,7 +30,13 @@ if(!defined('DOKU_INC')) define('DOKU_IN
21 if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
23 // define config path (packagers may want to change this to /etc/dokuwiki/)
24 -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
25 +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
27 +// define path where variable data is saved (packagers may want to change this to /var/lib/dokuwiki/)
28 +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
30 +// define path where cache data saved (packagers may want to change this to /var/cache/dokuwiki/)
31 +if(!defined('DOKU_CACHE')) define('DOKU_CACHE','/var/cache/dokuwiki/');
33 // check for error reporting override or set error reporting to sane values
34 if (!defined('DOKU_E_LEVEL') && file_exists(DOKU_CONF.'report_e_all')) {
35 --- dokuwiki-2022-07-31a/install.php~ 2022-09-03 20:15:22.000000000 +0300
36 +++ dokuwiki-2022-07-31a/install.php 2023-03-30 17:55:35.143109306 +0300
40 if (!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__) . '/');
41 -if (!defined('DOKU_CONF')) define('DOKU_CONF', DOKU_INC . 'conf/');
42 -if (!defined('DOKU_LOCAL')) define('DOKU_LOCAL', DOKU_INC . 'conf/');
43 +if (!defined('DOKU_CONF')) define('DOKU_CONF', '/etc/webapps/dokuwiki/');
44 +if (!defined('DOKU_LOCAL')) define('DOKU_LOCAL', DOKU_CONF);
45 +if (!defined('DOKU_DATA')) define('DOKU_DATA', '/var/lib/dokuwiki/');
46 +if (!defined('DOKU_CACHE')) define('DOKU_CACHE', '/var/cache/dokuwiki/');
48 // load and initialize the core system
49 require_once(DOKU_INC . 'inc/init.php');
53 'data' => DOKU_INC . 'data',
54 - 'pages' => DOKU_INC . 'data/pages',
55 - 'attic' => DOKU_INC . 'data/attic',
56 - 'media' => DOKU_INC . 'data/media',
57 - 'media_attic' => DOKU_INC . 'data/media_attic',
58 - 'media_meta' => DOKU_INC . 'data/media_meta',
59 - 'meta' => DOKU_INC . 'data/meta',
60 - 'cache' => DOKU_INC . 'data/cache',
61 - 'locks' => DOKU_INC . 'data/locks',
62 - 'index' => DOKU_INC . 'data/index',
63 - 'tmp' => DOKU_INC . 'data/tmp'
64 + 'pages' => DOKU_DATA . 'pages',
65 + 'attic' => DOKU_DATA . 'attic',
66 + 'media' => DOKU_DATA . 'media',
67 + 'media_attic' => DOKU_DATA . 'media_attic',
68 + 'media_meta' => DOKU_DATA . 'media_meta',
69 + 'meta' => DOKU_DATA . 'meta',
70 + 'cache' => DOKU_CACHE,
71 + 'locks' => DOKU_DATA . 'locks',
72 + 'index' => DOKU_DATA . 'index',
73 + 'tmp' => DOKU_DATA . 'tmp'