[pkg-kolab] r1121 - in kolab-webclient/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-01-11 21:49:52 +0000 (Sun, 11 Jan 2009)
New Revision: 1121

Added:
   kolab-webclient/trunk/debian/patches/20-data-directories.diff
Modified:
   kolab-webclient/trunk/debian/dirs
   kolab-webclient/trunk/debian/patches/series
Log:
Change data directories to match FHS



Modified: kolab-webclient/trunk/debian/dirs
===================================================================
--- kolab-webclient/trunk/debian/dirs	2009-01-11 21:42:48 UTC (rev 1120)
+++ kolab-webclient/trunk/debian/dirs	2009-01-11 21:49:52 UTC (rev 1121)
@@ -9,4 +9,8 @@
 etc/horde/dimp1
 etc/kolab/templates
 etc/kolab-webclient
+var/lib/kolab-webclient
+var/lib/kolab-webclient/tmp
+var/lib/kolab-webclient/storage
+var/log/kolab-webclient
 

Added: kolab-webclient/trunk/debian/patches/20-data-directories.diff
===================================================================
--- kolab-webclient/trunk/debian/patches/20-data-directories.diff	                        (rev 0)
+++ kolab-webclient/trunk/debian/patches/20-data-directories.diff	2009-01-11 21:49:52 UTC (rev 1121)
@@ -0,0 +1,53 @@
+Goal: Change data directories to match FHS
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Should be reported (parts can be integrated)
+
+Index: b/horde-config/horde3/conf.php
+===================================================================
+--- a/horde-config/horde3/conf.php
++++ b/horde-config/horde3/conf.php
+@@ -7,7 +7,7 @@
+ $conf['compress_pages'] = true;
+ $conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';
+ $conf['umask'] = 077;
+-$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
++$conf['tmpdir'] = '/var/lib/kolab-webclient/tmp/';
+ $conf['use_ssl'] = 2;
+ $conf['server']['name'] = $_SERVER['SERVER_NAME'];
+ $conf['server']['port'] = $_SERVER['SERVER_PORT'];
+@@ -21,7 +21,7 @@
+ $conf['session']['timeout'] = 0;
+ $conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
+ $conf['cookie']['path'] = '/';
+-$conf['sql']['database'] = dirname(__FILE__) . '/../storage/horde.db';
++$conf['sql']['database'] = '/var/lib/kolab-webclient/storage/horde.db';
+ $conf['sql']['mode'] = '0640';
+ $conf['sql']['charset'] = 'utf-8';
+ $conf['sql']['phptype'] = 'sqlite';
+@@ -38,13 +38,13 @@
+ $conf['log']['priority'] = PEAR_LOG_DEBUG;
+ $conf['log']['ident'] = 'HORDE';
+ $conf['log']['params'] = array();
+-$conf['log']['name'] = dirname(__FILE__) . '/../log/horde.log';
++$conf['log']['name'] = '/var/log/kolab-webclient/horde.log';
+ $conf['log']['params']['append'] = true;
+ $conf['log']['type'] = 'file';
+ $conf['log']['enabled'] = true;
+ $conf['log_accesskeys'] = false;
+ $conf['prefs']['driver'] = 'file';
+-$conf['prefs']['params']['directory'] = dirname(__FILE__) . '/../storage/';
++$conf['prefs']['params']['directory'] = '/var/log/kolab-webclient/storage/';
+ $conf['alarms']['params']['driverconfig'] = 'horde';
+ $conf['alarms']['params']['ttl'] = 300;
+ $conf['alarms']['driver'] = 'sql';
+@@ -69,7 +69,7 @@
+ $conf['mailer']['params']['auth'] = true;
+ $conf['mailer']['type'] = 'smtp';
+ $conf['mailformat']['brokenrfc2231'] = false;
+-$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../storage';
++$conf['vfs']['params']['vfsroot'] = '/var/log/kolab-webclient/storage';
+ $conf['vfs']['type'] = 'file';
+ $conf['sessionhandler']['type'] = 'none';
+ $conf['sessionhandler']['memcache'] = false;

Modified: kolab-webclient/trunk/debian/patches/series
===================================================================
--- kolab-webclient/trunk/debian/patches/series	2009-01-11 21:42:48 UTC (rev 1120)
+++ kolab-webclient/trunk/debian/patches/series	2009-01-11 21:49:52 UTC (rev 1121)
@@ -1 +1,2 @@
+20-data-directories.diff
 10_kolab-templates-meta.diff