add dokuwiki-plugin-gallery conflict

[packages/dokuwiki.git] / dokuwiki-paths.patch

diff --git a/dokuwiki-paths.patch b/dokuwiki-paths.patch
index 71ca0da0d8e70c746447f07d3b80a6311b4b9359..2b5b4bb578052c8bd9ce778fd9c6aa7d2f8086d7 100644 (file)
--- a/dokuwiki-paths.patch
+++ b/dokuwiki-paths.patch
@@ -7,6 +7,9 @@ add new constants, that makes packaging (rpm, deb) dokuwiki better fit
 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 ++++++++++++++------------
@@ -35,14 +38,16 @@ diff --git a/install.php b/install.php
 index 80e9ad4..fe72513 100644
 --- a/install.php
 +++ b/install.php
-@@ -7,7 +7,9 @@
+@@ -6,8 +6,10 @@
+  */
  
  if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
- if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
+-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',DOKU_INC.'data');
-+if(!defined('DOKU_CACHE')) define('DOKU_CACHE',DOKU_DATA.'cache');
++if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki/');
++if(!defined('DOKU_CACHE')) define('DOKU_CACHE','/var/cache/dokuwiki/');
  
  require_once(DOKU_INC.'inc/PassHash.class.php');