thomas: server/horde/horde ChangeLog, 1.7, 1.8 horde-kolab-conf.template, 1.5, 1.6 horde-kolab.spec, 1.27, 1.28

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv3427/horde/horde

Modified Files:
	ChangeLog horde-kolab-conf.template horde-kolab.spec 
Log Message:
Allow login to horde and fbview if public imap service is disabled.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	13 May 2008 06:56:14 -0000	1.7
+++ ChangeLog	5 Jun 2008 16:20:06 -0000	1.8
@@ -1,3 +1,8 @@
+2008-06-05  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* horde-kolab-conf.template: Fix server address if imap service
+	is disabled (i.e. only listening on localhost).
+
 2008-05-13  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-kolab.spec: kolab/issue2134 ([Horde]Unable to send message with attachments)

Index: horde-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab-conf.template,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-kolab-conf.template	6 Sep 2007 10:03:27 -0000	1.5
+++ horde-kolab-conf.template	5 Jun 2008 16:20:06 -0000	1.6
@@ -12,6 +12,10 @@
 $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
 $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
 $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
+@@@if cyrus-imap@@@
 $conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
+@@@else@@@
+$conf['kolab']['imap']['server'] = '@@@local_addr@@@';
+@@@endif@@@
 $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
 ?>

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- horde-kolab.spec	13 May 2008 06:56:14 -0000	1.27
+++ horde-kolab.spec	5 Jun 2008 16:20:06 -0000	1.28
@@ -2,7 +2,7 @@
 %define         V_horde_name horde
 %define         V_package %{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 04
+%define         V_month 06
 %define         V_day   05
 %define         V_version 3.2_rc3
 %define         V_uver    3.2-rc2