[pkg-kolab] r1230 - in kolab-webclient/trunk: debian debian/patches horde-config/horde3 horde-config/imp4 kolab-templates

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Sat Mar 7 16:41:42 UTC 2009 

Author: mparent-guest
Date: 2009-03-07 16:41:42 +0000 (Sat, 07 Mar 2009)
New Revision: 1230

Removed:
   kolab-webclient/trunk/debian/patches/10_kolab-templates-meta.diff
   kolab-webclient/trunk/debian/patches/30-cookie_path.diff
Modified:
   kolab-webclient/trunk/debian/changelog
   kolab-webclient/trunk/debian/patches/series
   kolab-webclient/trunk/horde-config/horde3/conf.php
   kolab-webclient/trunk/horde-config/imp4/conf.php
   kolab-webclient/trunk/kolab-templates/webclient-kolab-conf.template
   kolab-webclient/trunk/kolab-templates/webclient-kronolith-kolab-conf.template
Log:
* New rc release 2.2.1-rc1 (2.2.1-20090304)
  + 10_kolab-templates-meta.diff integrated
  + 30-cookie_path.diff integrated


Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog	2009-03-07 16:05:07 UTC (rev 1229)
+++ kolab-webclient/trunk/debian/changelog	2009-03-07 16:41:42 UTC (rev 1230)
@@ -1,6 +1,11 @@
-kolab-webclient (1.2.0~beta1~pre10) unstable; urgency=low
+kolab-webclient (1.2.0-20090226) unstable; urgency=low
 
-  * Initial Release
+  * Initial Release  2.2.1-beta1 (20081212)
+  * New rc release 2.2.1-rc1 (2.2.1-20090304)
+    + 10_kolab-templates-meta.diff integrated (kolab/issue3387):
+      - Adapt KOLAB_META for kolab templates
+      - Use ldap_uri instead of fqdn when connecting to LDAP
+    + 30-cookie_path.diff integrated: Change cookie path for Horde (kolab/issue3387)
   * Depends on Horde components: horde3, imp4, ingo1, kronolith2, turba2, nag2,
     mnemo2
   * Depends on php-db, php5-sqlite and sqlite (for horde databases),
@@ -22,11 +27,7 @@
   * Apache config in /etc/kolab-webclient/apache.conf
     - symlinked in /etc/apache2/conf.d/kolab-webclient.conf
     - apache2 is reloaded on configure
-  * 10_kolab-templates-meta.diff:
-    - Adapt KOLAB_META for kolab templates
-    - Use ldap_uri instead of fqdn when connecting to LDAP
   * 20-data-directories.diff: Change data directories to match FHS
-  * 30-cookie_path.diff: Change cookie path for Horde
   * debian/copyright: refers to versionned license version
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 10 Feb 2009 22:38:38 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 07 Mar 2009 17:36:44 +0100

Deleted: kolab-webclient/trunk/debian/patches/10_kolab-templates-meta.diff
===================================================================
--- kolab-webclient/trunk/debian/patches/10_kolab-templates-meta.diff	2009-03-07 16:05:07 UTC (rev 1229)
+++ kolab-webclient/trunk/debian/patches/10_kolab-templates-meta.diff	2009-03-07 16:41:42 UTC (rev 1230)
@@ -1,44 +0,0 @@
-Goal: Adapt KOLAB_META for kolab templates
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: See https://www.intevation.de/roundup/kolab/issue3387
-
-Index: b/kolab-templates/webclient-kolab-conf.template
-===================================================================
---- a/kolab-templates/webclient-kolab-conf.template
-+++ b/kolab-templates/webclient-kolab-conf.template
-@@ -1,14 +1,14 @@
- KOLAB_META_START
--TARGET=@@@webserver_document_root@@@/client/config/kolab.php
--PERMISSIONS=0600
--OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
-+TARGET=/etc/kolab-webclient/horde3/kolab.php
-+PERMISSIONS=0400
-+OWNERSHIP=www-data:www-data
- KOLAB_META_END
- <?php
- $conf['cookie']['domain'] = '@@@fqdnhostname@@@';
- $conf['cookie']['path'] = '/client';
- $conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
- $conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
--$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
-+$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
- $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
- $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
- $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
-Index: b/kolab-templates/webclient-kronolith-kolab-conf.template
-===================================================================
---- a/kolab-templates/webclient-kronolith-kolab-conf.template
-+++ b/kolab-templates/webclient-kronolith-kolab-conf.template
-@@ -1,7 +1,7 @@
- KOLAB_META_START
--TARGET=@@@webserver_document_root@@@/client/kronolith/config/kolab.php
--PERMISSIONS=0600
--OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
-+TARGET=/etc/kolab-webclient/kronolith2/kolab.php
-+PERMISSIONS=0400
-+OWNERSHIP=www-data:www-data
- KOLAB_META_END
- <?php
- $conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';

Deleted: kolab-webclient/trunk/debian/patches/30-cookie_path.diff
===================================================================
--- kolab-webclient/trunk/debian/patches/30-cookie_path.diff	2009-03-07 16:05:07 UTC (rev 1229)
+++ kolab-webclient/trunk/debian/patches/30-cookie_path.diff	2009-03-07 16:41:42 UTC (rev 1230)
@@ -1,19 +0,0 @@
-Goal: Change cookie path for Horde
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: See https://www.intevation.de/roundup/kolab/issue3387
-
-Index: b/kolab-templates/webclient-kolab-conf.template
-===================================================================
---- a/kolab-templates/webclient-kolab-conf.template
-+++ b/kolab-templates/webclient-kolab-conf.template
-@@ -5,7 +5,7 @@
- KOLAB_META_END
- <?php
- $conf['cookie']['domain'] = '@@@fqdnhostname@@@';
--$conf['cookie']['path'] = '/client';
-+$conf['cookie']['path'] = '/horde3';
- $conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
- $conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
- $conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';

Modified: kolab-webclient/trunk/debian/patches/series
===================================================================
--- kolab-webclient/trunk/debian/patches/series	2009-03-07 16:05:07 UTC (rev 1229)
+++ kolab-webclient/trunk/debian/patches/series	2009-03-07 16:41:42 UTC (rev 1230)
@@ -1,3 +1 @@
-10_kolab-templates-meta.diff
 20-data-directories.diff
-30-cookie_path.diff

Modified: kolab-webclient/trunk/horde-config/horde3/conf.php
===================================================================
--- kolab-webclient/trunk/horde-config/horde3/conf.php	2009-03-07 16:05:07 UTC (rev 1229)
+++ kolab-webclient/trunk/horde-config/horde3/conf.php	2009-03-07 16:41:42 UTC (rev 1230)
@@ -16,7 +16,7 @@
 $conf['urls']['pretty'] = false;
 $conf['safe_ips'] = array();
 $conf['session']['name'] = 'Horde';
-$conf['session']['use_only_cookies'] = false;
+$conf['session']['use_only_cookies'] = true;
 $conf['session']['cache_limiter'] = 'nocache';
 $conf['session']['timeout'] = 0;
 $conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
@@ -30,10 +30,8 @@
 $conf['auth']['checkbrowser'] = true;
 $conf['auth']['alternate_login'] = false;
 $conf['auth']['redirect_on_logout'] = false;
-$conf['auth']['params']['login_block'] = true;
-$conf['auth']['params']['login_block_count'] = 3;
-$conf['auth']['params']['login_block_time'] = 5;
-$conf['auth']['driver'] = 'kolab';
+$conf['auth']['params']['app'] = 'imp';
+$conf['auth']['driver'] = 'application';
 $conf['signup']['allow'] = false;
 $conf['log']['priority'] = PEAR_LOG_DEBUG;
 $conf['log']['ident'] = 'HORDE';

Modified: kolab-webclient/trunk/horde-config/imp4/conf.php
===================================================================
--- kolab-webclient/trunk/horde-config/imp4/conf.php	2009-03-07 16:05:07 UTC (rev 1229)
+++ kolab-webclient/trunk/horde-config/imp4/conf.php	2009-03-07 16:41:42 UTC (rev 1230)
@@ -57,6 +57,7 @@
 $conf['hooks']['mbox_icon'] = true;
 $conf['hooks']['spam_bounce'] = false;
 $conf['hooks']['msglist_format'] = false;
+$conf['hooks']['display_folder'] = true;
 $conf['maillog']['use_maillog'] = true;
 $conf['sentmail']['driver'] = 'none';
 $conf['tasklist']['use_tasklist'] = true;

Modified: kolab-webclient/trunk/kolab-templates/webclient-kolab-conf.template
===================================================================
--- kolab-webclient/trunk/kolab-templates/webclient-kolab-conf.template	2009-03-07 16:05:07 UTC (rev 1229)
+++ kolab-webclient/trunk/kolab-templates/webclient-kolab-conf.template	2009-03-07 16:41:42 UTC (rev 1230)
@@ -1,14 +1,14 @@
 KOLAB_META_START
-TARGET=@@@webserver_document_root@@@/client/config/kolab.php
-PERMISSIONS=0600
-OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
+TARGET=@@@horde_confdir@@@/kolab.php
+PERMISSIONS=0400
+OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
 KOLAB_META_END
 <?php
 $conf['cookie']['domain'] = '@@@fqdnhostname@@@';
-$conf['cookie']['path'] = '/client';
+$conf['cookie']['path'] = '@@@horde_cookie_path@@@';
 $conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
 $conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
-$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
 $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
 $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
 $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';

Modified: kolab-webclient/trunk/kolab-templates/webclient-kronolith-kolab-conf.template
===================================================================
--- kolab-webclient/trunk/kolab-templates/webclient-kronolith-kolab-conf.template	2009-03-07 16:05:07 UTC (rev 1229)
+++ kolab-webclient/trunk/kolab-templates/webclient-kronolith-kolab-conf.template	2009-03-07 16:41:42 UTC (rev 1230)
@@ -1,7 +1,7 @@
 KOLAB_META_START
-TARGET=@@@webserver_document_root@@@/client/kronolith/config/kolab.php
-PERMISSIONS=0600
-OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
+TARGET=@@@kronolith_confdir@@@/kolab.php
+PERMISSIONS=0400
+OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
 KOLAB_META_END
 <?php
 $conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';

More information about the pkg-kolab-devel mailing list