to [FHS standards](http://www.pathname.com/fhs/pub/fhs-2.3.html):
- DOKU_DATA - /var/lib/dokuwiki/
- DOKU_CACHE - /var/cache/dokuwiki/
+
+Currently upstream is not interested of merging this:
+https://github.com/splitbrain/dokuwiki/pull/108#issuecomment-6833563
---
inc/init.php | 8 +++++++-
install.php | 26 ++++++++++++++------------
2 files changed, 21 insertions(+), 13 deletions(-)
-diff --git a/inc/init.php b/inc/init.php
-index 403fbe4..29d96b2 100644
---- a/inc/init.php
-+++ b/inc/init.php
-@@ -23,7 +23,13 @@ if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/
+--- dokuwiki-2018-04-22c.org/inc/init.php 2020-05-01 12:38:20.000000000 +0200
++++ dokuwiki-2018-04-22c/inc/init.php 2022-09-27 22:46:28.397714335 +0200
+@@ -30,7 +30,13 @@ if(!defined('DOKU_INC')) define('DOKU_IN
if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
// define config path (packagers may want to change this to /etc/dokuwiki/)
+if(!defined('DOKU_CACHE')) define('DOKU_CACHE','/var/cache/dokuwiki/');
// check for error reporting override or set error reporting to sane values
- if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
-@@ -234,13 +234,14 @@
- 'mediaolddir' => 'media_attic',
- 'metadir' => 'meta',
- 'mediametadir' => 'media_meta',
-- 'cachedir' => 'cache',
-+ 'cachedir' => '/var/cache/dokuwiki',
- 'indexdir' => 'index',
- 'lockdir' => 'locks',
- 'tmpdir' => 'tmp');
-
- foreach($paths as $c => $p) {
-- $path = empty($conf[$c]) ? $conf['savedir'].'/'.$p : $conf[$c];
-+ $path = empty($conf[$c]) ? $p : $conf[$c];
-+ $path = $path[0] == '/' ? $path : $conf['savedir'].'/'.$path;
- $conf[$c] = init_path($path);
- if(empty($conf[$c]))
- nice_die("The $c ('$p') at $path is not found, isn't accessible or writable.
-diff --git a/install.php b/install.php
-index 80e9ad4..fe72513 100644
---- a/install.php
-+++ b/install.php
-@@ -7,7 +7,9 @@
-
- if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
- if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
--if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
-+if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_CONF);
-+if(!defined('DOKU_DATA')) define('DOKU_DATA',DOKU_INC.'data');
-+if(!defined('DOKU_CACHE')) define('DOKU_CACHE',DOKU_DATA.'cache');
-
- require_once(DOKU_INC.'inc/PassHash.class.php');
+ if (!defined('DOKU_E_LEVEL') && file_exists(DOKU_CONF.'report_e_all')) {
+--- dokuwiki-2022-07-31a/install.php~ 2022-09-03 20:15:22.000000000 +0300
++++ dokuwiki-2022-07-31a/install.php 2023-03-30 17:55:35.143109306 +0300
+@@ -16,8 +16,10 @@
+ */
-@@ -428,17 +430,17 @@ function check_permissions(){
+ if (!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__) . '/');
+-if (!defined('DOKU_CONF')) define('DOKU_CONF', DOKU_INC . 'conf/');
+-if (!defined('DOKU_LOCAL')) define('DOKU_LOCAL', DOKU_INC . 'conf/');
++if (!defined('DOKU_CONF')) define('DOKU_CONF', '/etc/webapps/dokuwiki/');
++if (!defined('DOKU_LOCAL')) define('DOKU_LOCAL', DOKU_CONF);
++if (!defined('DOKU_DATA')) define('DOKU_DATA', '/var/lib/dokuwiki/');
++if (!defined('DOKU_CACHE')) define('DOKU_CACHE', '/var/cache/dokuwiki/');
+ // load and initialize the core system
+ require_once(DOKU_INC . 'inc/init.php');
+@@ -540,16 +540,16 @@
$dirs = array(
'conf' => DOKU_LOCAL,
-- 'data' => DOKU_INC.'data',
-- 'pages' => DOKU_INC.'data/pages',
-- 'attic' => DOKU_INC.'data/attic',
-- 'media' => DOKU_INC.'data/media',
-- 'media_attic' => DOKU_INC.'data/media_attic',
-- 'media_meta' => DOKU_INC.'data/media_meta',
-- 'meta' => DOKU_INC.'data/meta',
-- 'cache' => DOKU_INC.'data/cache',
-- 'locks' => DOKU_INC.'data/locks',
-- 'index' => DOKU_INC.'data/index',
-- 'tmp' => DOKU_INC.'data/tmp'
-+ 'data' => DOKU_DATA,
-+ 'pages' => DOKU_DATA.'pages',
-+ 'attic' => DOKU_DATA.'attic',
-+ 'media' => DOKU_DATA.'media',
-+ 'media_attic' => DOKU_DATA.'media_attic',
-+ 'media_meta' => DOKU_DATA.'media_meta',
-+ 'meta' => DOKU_DATA.'meta',
+ 'data' => DOKU_INC . 'data',
+- 'pages' => DOKU_INC . 'data/pages',
+- 'attic' => DOKU_INC . 'data/attic',
+- 'media' => DOKU_INC . 'data/media',
+- 'media_attic' => DOKU_INC . 'data/media_attic',
+- 'media_meta' => DOKU_INC . 'data/media_meta',
+- 'meta' => DOKU_INC . 'data/meta',
+- 'cache' => DOKU_INC . 'data/cache',
+- 'locks' => DOKU_INC . 'data/locks',
+- 'index' => DOKU_INC . 'data/index',
+- 'tmp' => DOKU_INC . 'data/tmp'
++ 'pages' => DOKU_DATA . 'pages',
++ 'attic' => DOKU_DATA . 'attic',
++ 'media' => DOKU_DATA . 'media',
++ 'media_attic' => DOKU_DATA . 'media_attic',
++ 'media_meta' => DOKU_DATA . 'media_meta',
++ 'meta' => DOKU_DATA . 'meta',
+ 'cache' => DOKU_CACHE,
-+ 'locks' => DOKU_DATA.'locks',
-+ 'index' => DOKU_DATA.'index',
-+ 'tmp' => DOKU_DATA.'tmp'
++ 'locks' => DOKU_DATA . 'locks',
++ 'index' => DOKU_DATA . 'index',
++ 'tmp' => DOKU_DATA . 'tmp'
);
$ok = true;
---
-1.7.7.4
projects / packages / dokuwiki.git / blobdiff