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 diff --git a/inc/init.php b/inc/init.php
19 index 403fbe4..29d96b2 100644
22 @@ -23,7 +23,13 @@ if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/
23 if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
25 // define config path (packagers may want to change this to /etc/dokuwiki/)
26 -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
27 +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
29 +// define path where variable data is saved (packagers may want to change this to /var/lib/dokuwiki/)
30 +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
32 +// define path where cache data saved (packagers may want to change this to /var/cache/dokuwiki/)
33 +if(!defined('DOKU_CACHE')) define('DOKU_CACHE','/var/cache/dokuwiki/');
35 // check for error reporting override or set error reporting to sane values
36 if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
37 diff --git a/install.php b/install.php
38 index 80e9ad4..fe72513 100644
44 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
45 -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
46 -if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
47 +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
48 +if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_CONF);
49 +if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
50 +if(!defined('DOKU_CACHE')) define('DOKU_CACHE','/var/cache/dokuwiki/');
52 require_once(DOKU_INC.'inc/PassHash.class.php');
54 @@ -428,17 +430,17 @@ function check_permissions(){
58 - 'data' => DOKU_INC.'data',
59 - 'pages' => DOKU_INC.'data/pages',
60 - 'attic' => DOKU_INC.'data/attic',
61 - 'media' => DOKU_INC.'data/media',
62 - 'media_attic' => DOKU_INC.'data/media_attic',
63 - 'media_meta' => DOKU_INC.'data/media_meta',
64 - 'meta' => DOKU_INC.'data/meta',
65 - 'cache' => DOKU_INC.'data/cache',
66 - 'locks' => DOKU_INC.'data/locks',
67 - 'index' => DOKU_INC.'data/index',
68 - 'tmp' => DOKU_INC.'data/tmp'
69 + 'data' => DOKU_DATA,
70 + 'pages' => DOKU_DATA.'pages',
71 + 'attic' => DOKU_DATA.'attic',
72 + 'media' => DOKU_DATA.'media',
73 + 'media_attic' => DOKU_DATA.'media_attic',
74 + 'media_meta' => DOKU_DATA.'media_meta',
75 + 'meta' => DOKU_DATA.'meta',
76 + 'cache' => DOKU_CACHE,
77 + 'locks' => DOKU_DATA.'locks',
78 + 'index' => DOKU_DATA.'index',
79 + 'tmp' => DOKU_DATA.'tmp'