steffen: server/kolab/kolab/templates fbview.conf.template, 1.3, 1.4 freebusy.conf.template, 1.5, 1.6 httpd.conf.template, 1.7, 1.8 imapd.conf.template, 1.9, 1.10 kolab.conf.template, 1.2, 1.3 main.cf.template, 1.9, 1.10 resmgr.conf.template, 1.6, 1.7 saslauthd.conf.template, 1.3, 1.4 session_vars.php.template, 1.4, 1.5 slapd.conf.template, 1.6, 1.7
cvs at intevation.de
cvs at intevation.de
Thu Aug 12 12:55:41 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv3739/kolab/kolab/templates
Modified Files:
fbview.conf.template freebusy.conf.template
httpd.conf.template imapd.conf.template kolab.conf.template
main.cf.template resmgr.conf.template saslauthd.conf.template
session_vars.php.template slapd.conf.template
Log Message:
*BOMB*. Changes to support the new schema
Index: fbview.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/fbview.conf.template,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbview.conf.template 1 Jul 2004 02:20:56 -0000 1.3
+++ fbview.conf.template 12 Aug 2004 10:55:39 -0000 1.4
@@ -1,7 +1,7 @@
<?php
// What is the address of the Cyrus server where the calendar data is stored?
-$params['server'] = '@@@fqhostname@@@';
+$params['server'] = '@@@fqdnhostname@@@';
// What is the Base DN of our LDAP database?
$params['base_dn'] = '@@@base_dn@@@';
@@ -32,4 +32,4 @@
$params['calendar_store'] = 'Calendar';
// Where can we get free/busy information from?
-$params['freebusy_url'] = 'https://'.urlencode($params['calendar_user']).':'.urlencode($params['calendar_pass']).'@'.'@@@fqhostname@@@/freebusy/${USER}.xfb';
+$params['freebusy_url'] = 'https://'.urlencode($params['calendar_user']).':'.urlencode($params['calendar_pass']).'@'.'@@@fqdnhostname@@@/freebusy/${USER}.xfb';
Index: freebusy.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/freebusy.conf.template,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freebusy.conf.template 1 Jul 2004 02:20:56 -0000 1.5
+++ freebusy.conf.template 12 Aug 2004 10:55:39 -0000 1.6
@@ -4,7 +4,7 @@
$params['kolab_prefix'] = '@l_prefix@';
// The name of _this_ server
-$params['server'] = '@@@fqhostname@@@';
+$params['server'] = '@@@fqdnhostname@@@';
// What is the address of the LDAP server address where user objects reside
$params['ldap_uri'] = '@@@ldap_uri@@@';
@@ -18,7 +18,7 @@
$params['multi_location'] = true;
// What LDAP attribute is used to store the users' home server address?
-$params['home_server'] = 'homeServer';
+$params['home_server'] = 'kolabhomeserver';
// What is our default mail domain? This is used if any users do not have
// '@domain' specified after their username as part of their email address.
Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/httpd.conf.template,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- httpd.conf.template 11 Jul 2004 16:06:18 -0000 1.7
+++ httpd.conf.template 12 Aug 2004 10:55:39 -0000 1.8
@@ -124,7 +124,7 @@
AccessFileName .htaccess
<Location />
- ErrorDocument 403 https://@@@fqhostname@@@/admin/
+ ErrorDocument 403 https://@@@fqdnhostname@@@/admin/
</Location>
<Files ~ "^\.ht">
Index: imapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/imapd.conf.template,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- imapd.conf.template 16 Jul 2004 12:40:14 -0000 1.9
+++ imapd.conf.template 12 Aug 2004 10:55:39 -0000 1.10
@@ -17,7 +17,7 @@
sendmail: @l_prefix@/sbin/sendmail
allowanonymouslogin: no
allowplaintext: yes
-servername: @@@fqhostname@@@
+servername: @@@fqdnhostname@@@
autocreatequota: @@@cyrus-autocreatequota@@@
reject8bit: no
munge8bit: no
Index: kolab.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/kolab.conf.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.conf.template 14 Jul 2004 21:17:42 -0000 1.2
+++ kolab.conf.template 12 Aug 2004 10:55:39 -0000 1.3
@@ -1,7 +1,7 @@
# This program is Free Software under the GNU General Public License (>=v2).
# Read the file COPYING that comes with this packages for details.
-fqhostname : @@@fqhostname@@@
+fqdnhostname : @@@fqdnhostname@@@
is_master : @@@is_master@@@
base_dn : @@@kolab_basedn@@@
bind_dn : cn=manager,@@@kolab_basedn@@@
Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/main.cf.template,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- main.cf.template 5 Aug 2004 21:01:29 -0000 1.9
+++ main.cf.template 12 Aug 2004 10:55:39 -0000 1.10
@@ -20,7 +20,7 @@
default_privs= @l_nusr@
# local host
-myhostname = @@@fqhostname@@@
+myhostname = @@@fqdnhostname@@@
mydomain = @@@postfix-mydomain@@@
myorigin = $mydomain
@@ -164,8 +164,8 @@
ldaptransport_server_host = @@@ldap_uri@@@
ldaptransport_search_base = @@@user_dn_list@@@
-ldaptransport_query_filter = (&(mail=%s)(objectClass=kInetOrgPerson)(!(homeServer=$myhostname)))
-ldaptransport_result_attribute = homeServer
+ldaptransport_query_filter = (&(mail=%s)(objectClass=kolabinetorgperson)(!(kolabhomeserver=$myhostname)))
+ldaptransport_result_attribute = kolabhomeserver
ldaptransport_result_filter = smtp:[%s]
ldaptransport_search_timeout = 2
ldaptransport_scope = sub
Index: resmgr.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/resmgr.conf.template,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- resmgr.conf.template 16 Jul 2004 12:40:14 -0000 1.6
+++ resmgr.conf.template 12 Aug 2004 10:55:39 -0000 1.7
@@ -43,7 +43,7 @@
$params['calendar_store'] = 'Calendar';
// Where can we get free/busy information from?
-$params['freebusy_url'] = 'http://@@@fqhostname@@@/freebusy/${USER}.ifb';
+$params['freebusy_url'] = 'http://@@@fqdnhostname@@@/freebusy/${USER}.ifb';
// Where are we logging to?
$params['log'] = 'file:@l_prefix@/var/resmgr/resmgr.log'; // File...
Index: saslauthd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/saslauthd.conf.template,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- saslauthd.conf.template 10 Aug 2004 14:39:38 -0000 1.3
+++ saslauthd.conf.template 12 Aug 2004 10:55:39 -0000 1.4
@@ -66,7 +66,7 @@
# uses userPassword attribute to verify the password. Currently, {CRYPT}
# hash is supported.
-ldap_filter: (&(|(mail=%u@%d)(mail=%u)(uid=%u@%d)(uid=%u))(!(deleteflag=*)))
+ldap_filter: (&(|(mail=%u@%d)(mail=%u)(uid=%u@%d)(uid=%u))(!(kolabdeleteflag=*)))
#ldap_filter: <uid=%u>
# Specify a filter. Use the %u and %r tokens for the username and realm
# substitution. The %u token has to be used at minimum for the filter to
Index: session_vars.php.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/session_vars.php.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- session_vars.php.template 14 Jul 2004 21:17:42 -0000 1.4
+++ session_vars.php.template 12 Aug 2004 10:55:39 -0000 1.5
@@ -8,7 +8,7 @@
*/
session_start();
-$_SESSION['fqhostname'] = "@@@fqhostname@@@";
+$_SESSION['fqdnhostname'] = "@@@fqdnhostname@@@";
$_SESSION['ldap_master_uri'] = "@@@ldap_uri@@@";
$_SESSION['base_dn'] = "@@@base_dn@@@";
$_SESSION['php_dn'] = "@@@php_dn@@@";
Index: slapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/slapd.conf.template,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- slapd.conf.template 12 Aug 2004 10:44:23 -0000 1.6
+++ slapd.conf.template 12 Aug 2004 10:55:39 -0000 1.7
@@ -11,7 +11,10 @@
# manual additions are lost unless made to the template in the Kolab config directory
# the template is @l_prefix@/etc/kolab/slapd.conf.template
-include @l_prefix@/etc/openldap/schema/kolab.schema
+include @l_prefix@/etc/openldap/schema/core.schema
+include @l_prefix@/etc/openldap/schema/cosine.schema
+include @l_prefix@/etc/openldap/schema/inetorgperson.schema
+include @l_prefix@/etc/openldap/schema/kolab2.schema
pidfile @l_prefix@/var/openldap/run/slapd.pid
replica-pidfile @l_prefix@/var/openldap/run/slurpd.pid
@@ -70,7 +73,7 @@
by group="cn=maintainer,@@@base_dn@@@" write
by * read stop
-access to attr=userquota
+access to attr=cyrus-userquota
by group="cn=admin,@@@base_dn@@@" write
by group="cn=maintainer,@@@base_dn@@@" write
by self read
More information about the commits
mailing list