bh: server/kolabd/kolabd/templates slapd.conf.template.in, 1.3, 1.4 amavisd.conf.template.in, 1.2, 1.3

cvs at intevation.de cvs at intevation.de
Fri Dec 9 17:02:18 CET 2005


Author: bh

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv17639/kolabd/kolabd/templates

Modified Files:
	slapd.conf.template.in amavisd.conf.template.in 
Log Message:
* templates/slapd.conf.template.in (require): For some reason, the
new OpenLDAP version from OpenPKG 2.5 doesn't accept the value
"none" for "require".  according to the manpage it's the default
anyway, so we comment it out.
(suffix): With the new OpenLDAP version, suffix has to be defined
before checkpoint, so rearrange it a bit.

* templates/amavisd.conf.template.in ($myhostname): The new
amavisd version from OpenPKG 2.5 actually checks whether the value
is a FQDN.  This is not the case for the default value taken from
uname on all systems, so explictly set it.


Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- slapd.conf.template.in	30 Nov 2005 03:14:19 -0000	1.3
+++ slapd.conf.template.in	9 Dec 2005 16:02:16 -0000	1.4
@@ -37,7 +37,7 @@
 
 defaultsearchbase      "@@@base_dn@@@"
 
-require 	none
+#require 	none
 allow 		bind_v2
 
 loglevel	0
@@ -45,13 +45,13 @@
 database        monitor
 
 database	bdb
+suffix		"@@@base_dn@@@"
 cachesize       2000
 checkpoint 	512 10
 idlcachesize    10000
 idletimeout     80 # The value can be increased if some clients develop problems.
                    # Please report to kolab-devel at kolab.org if you encounter such a client.
 
-suffix		"@@@base_dn@@@"
 directory	@ldapserver_dir@
 
 rootdn          "@@@bind_dn@@@"

Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- amavisd.conf.template.in	30 Nov 2005 02:42:03 -0000	1.2
+++ amavisd.conf.template.in	9 Dec 2005 16:02:16 -0000	1.3
@@ -68,7 +68,7 @@
 #$mydomain = 'example.com';      # (no useful default)
 $mydomain = '@@@postfix-mydomain@@@';
 
-# $myhostname = 'host.example.com';  # fqdn of this host, default by uname(3)
+$myhostname = '@@@fqdnhostname@@@';  # fqdn of this host, default by uname(3)
 
 # Set the user and group to which the daemon will change if started as root
 # (otherwise just keeps the UID unchanged, and these settings have no effect):





More information about the commits mailing list