[packages/dokuwiki: 3/5] Override logdir for system path

glen glen at pld-linux.org
Sun Apr 16 22:57:17 CEST 2023


commit 76b8692983ce4a26d0422510c8b82d8977618bc2
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Apr 3 14:01:25 2023 +0300

    Override logdir for system path

 dokuwiki-config.patch | 5 +++--
 dokuwiki.spec         | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 8bfddf7..deaa928 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -76,6 +76,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_appdir		%{_datadir}/%{_webapp}
 %define		_localstatedir	/var/lib/%{name}
 %define		_cachedir		/var/cache/%{name}
+%define		_logdir			/var/log/php/%{name}
 
 %define		_noautoreq_pear lib/byte_safe_strings.php lib/cast_to_int.php lib/error_polyfill.php lib/random.php other/ide_stubs/libsodium.php
 
@@ -180,7 +181,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{lang,plugin_lang},%{_localstatedir},%{_cachedir},%{_appdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{lang,plugin_lang},%{_localstatedir},%{_cachedir},%{_appdir},%{_logdir}}
 
 # hardlink test
 cp -al VERSION $RPM_BUILD_ROOT%{_appdir} 2>/dev/null && l=l
@@ -476,6 +477,7 @@ exit 0
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/dont-panic-if-you-see-this-in-your-logs-it-means-your-directory-permissions-are-correct.png
 
 %dir %attr(770,root,http) %{_cachedir}
+%dir %attr(770,root,http) %{_logdir}
 
 %files setup
 %defattr(644,root,root,755)
diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index f6cf761..8401d68 100644
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -1,6 +1,6 @@
 --- dokuwiki-2020-07-29a/conf/dokuwiki.php	2023-03-27 11:52:04.144883301 +0300
 +++ dokuwiki-2020-07-29a/conf/dokuwiki.php	2023-03-27 12:03:50.328816007 +0300
-@@ -13,14 +13,15 @@
+@@ -13,14 +13,16 @@
  
  
  /* Basic Settings */
@@ -16,10 +16,11 @@
 +$conf['license']     = 'publicdomain';    //see conf/license.php
 +$conf['savedir']     = '/var/lib/dokuwiki';  //where to store all the files
 +$conf['cachedir']    = '/var/cache/dokuwiki';  //where cache files are stored
++$conf['logdir']      = '/var/log/php/dokuwiki';
  $conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
  $conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
  $conf['cookiedir']   = '';                //path to use in cookies - blank for basedir
-@@ -140,7 +141,7 @@
+@@ -140,7 +142,7 @@
  $conf['rss_show_deleted'] = 1;           //Show deleted items 0|1
  
  /* Advanced Settings */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/145f7473e3df8f2a19a5634f0c0f422aa120bdbb



More information about the pld-cvs-commit mailing list