View | Details | Raw Unified | Return to bug 34994 | Differences between
and this patch

Collapse All | Expand All

(-)debian/univention-ldap-server.univention-config-registry-variables (+18 lines)
 Lines 36-41    Link Here 
36
Type=int
36
Type=int
37
Categories=service-ldap
37
Categories=service-ldap
38
38
39
[ldap/tool-threads]
40
Description[de]=Die Anzahl der verwendeten Tool-Threads (slapadd, slapindex).
41
Description[en]=The maximum number of threads to use in tool mode (slapadd, slapindex).
42
Type=int
43
Categories=service-ldap
44
39
[ldap/maxopenfiles]
45
[ldap/maxopenfiles]
40
Description[de]=Die maximale Anzahl an Dateien, die der LDAP-Server öffnen kann. Wenn der Wert angepasst wird, müssen ggf. auch Unix-Prozesslimits angepasst werden.
46
Description[de]=Die maximale Anzahl an Dateien, die der LDAP-Server öffnen kann. Wenn der Wert angepasst wird, müssen ggf. auch Unix-Prozesslimits angepasst werden.
41
Description[en]=The maximum of files the LDAP server can open. If the value is adapted, Unix process limits might need to be expanded as well.
47
Description[en]=The maximum of files the LDAP server can open. If the value is adapted, Unix process limits might need to be expanded as well.
 Lines 149-151    Link Here 
149
Description[en]=This variable is used to configure a time period in seconds after which the LDAP connection is closed on the server side. When the value is set to 0, no expiry period is in use.
155
Description[en]=This variable is used to configure a time period in seconds after which the LDAP connection is closed on the server side. When the value is set to 0, no expiry period is in use.
150
Type=int
156
Type=int
151
Categories=service-ldap
157
Categories=service-ldap
158
159
[ldap/database/mdb/maxsize]
160
Description[de]=Die maximale Größe der Datenbank in Bytes.
161
Description[en]=The maximum size of the database in bytes.
162
Type=int
163
Categories=service-ldap
164
165
[ldap/database/mdb/checkpoint]
166
Description[de]=Diese Variable konfiguriert die Häufigkeit mit der die Daten aus dem 'Transaction Log' in die Datenbank geschrieben werden. Änderungen sind nur in Ausnahmefällen nötig und sollten sorgfältig getestet werden. Die Syntax ist unter <http://www.openldap.org/faq/data/cache/1072.html> beschrieben.
167
Description[en]=This variable configures the frequency for checkpointing the database transaction log upon updating the database. Changes are only needed in exceptional cases and should be tested carefully. The syntax is documented at <http://www.openldap.org/faq/data/cache/1072.html>.
168
Type=str
169
Categories=service-ldap
(-)debian/univention-ldap-server.postinst (+1 lines)
 Lines 93-98    Link Here 
93
								ldap/idletimeout?360 \
93
								ldap/idletimeout?360 \
94
								ldap/index/autorebuild?yes \
94
								ldap/index/autorebuild?yes \
95
								ldap/threads?16 \
95
								ldap/threads?16 \
96
								ldap/tool-threads?1 \
96
								ldap/acl/user/password/change?no \
97
								ldap/acl/user/password/change?no \
97
								ldap/acl/slavepdc?yes \
98
								ldap/acl/slavepdc?yes \
98
								ldap/acl/nestedgroups?yes \
99
								ldap/acl/nestedgroups?yes \
(-)debian/univention-ldap-server.univention-config-registry (+8 lines)
 Lines 29-34    Link Here 
29
Variables: ldap/translogfile
29
Variables: ldap/translogfile
30
Variables: ldap/timeout
30
Variables: ldap/timeout
31
Variables: ldap/online/master
31
Variables: ldap/online/master
32
Variables: ldap/threads
33
Variables: ldap/tool-threads
34
Variables: ldap/database/mdb/maxsize
35
Variables: ldap/database/mdb/checkpoint
32
36
33
Type: subfile
37
Type: subfile
34
Multifile: etc/ldap/slapd.conf
38
Multifile: etc/ldap/slapd.conf
 Lines 59-61    Link Here 
59
Variables: ldap/online/master
63
Variables: ldap/online/master
60
Variables: ldap/translogfile
64
Variables: ldap/translogfile
61
Variables: ldap/k5pwd
65
Variables: ldap/k5pwd
66
Variables: ldap/threads
67
Variables: ldap/tool-threads
68
Variables: ldap/database/mdb/maxsize
69
Variables: ldap/database/mdb/checkpoint
(-)conffiles/etc/ldap/slapd.conf.d/40univention-ldap-server_database (-3 / +14 lines)
 Lines 19-29    Link Here 
19
	print "overlay\tk5pwd"
19
	print "overlay\tk5pwd"
20
@!@
20
@!@
21
21
22
@!@
23
if configRegistry['ldap/database/type'] == "mdb":
24
	print "maxsize\t%s" % configRegistry.get("ldap/database/mdb/maxsize", "75161927680") # 70GB default (sparse!)
25
else:
26
	print "cachesize\t%s" % configRegistry.get("ldap/cachesize")
27
	print "idlcachesize\t%s" % configRegistry.get("ldap/idlcachesize")
22
28
23
29
@!@
24
cachesize   @%@ldap/cachesize@%@
25
idlcachesize   @%@ldap/idlcachesize@%@
26
threads		@%@ldap/threads@%@
30
threads		@%@ldap/threads@%@
31
tool-threads @%@ldap/tool-threads@%@
27
32
28
@!@
33
@!@
29
if configRegistry['ldap/database/type'] == "bdb":
34
if configRegistry['ldap/database/type'] == "bdb":
 Lines 32-37    Link Here 
32
	else:
37
	else:
33
		print 'checkpoint 1024 30'
38
		print 'checkpoint 1024 30'
34
39
40
if configRegistry['ldap/database/type'] == "mdb":
41
	if configRegistry.has_key('ldap/database/mdb/checkpoint') and configRegistry['ldap/database/mdb/checkpoint']:
42
		print 'checkpoint %s'%configRegistry['ldap/database/mdb/checkpoint']
43
	else:
44
		print 'checkpoint 1024 30'
45
35
index_attrs={}
46
index_attrs={}
36
indextypes=['pres','eq','sub','approx']
47
indextypes=['pres','eq','sub','approx']
37
48
(-)01univention-ldap-server-init.inst (-3 / +8 lines)
 Lines 55-62    Link Here 
55
fi
55
fi
56
56
57
# initialize ldap
57
# initialize ldap
58
58
database_name="id2entry"
59
files=$(find /var/lib/univention-ldap/ldap/ -name "id2entry.*" -type f)
59
if [ "mdb" = "$ldap_database_type" ]; then
60
	database_name="data"
61
fi
62
files=$(find /var/lib/univention-ldap/ldap/ -name "$database_name.*" -type f)
60
if [ -z "$files" ] ; then
63
if [ -z "$files" ] ; then
61
	killall slapd >/dev/null 2>&1
64
	killall slapd >/dev/null 2>&1
62
	killall slapd >/dev/null 2>&1
65
	killall slapd >/dev/null 2>&1
 Lines 68-74    Link Here 
68
		mv "/etc/ldap/slapd.d/cn=config.ldif" "/etc/ldap/slapd.d/cn=config.ldif.DISABLED"
71
		mv "/etc/ldap/slapd.d/cn=config.ldif" "/etc/ldap/slapd.d/cn=config.ldif.DISABLED"
69
	fi
72
	fi
70
73
71
	univention-config-registry commit /var/lib/univention-ldap/ldap/DB_CONFIG
74
	if [ ! "mdb" = "$ldap_database_type" ]; then
75
		univention-config-registry commit /var/lib/univention-ldap/ldap/DB_CONFIG
76
	fi
72
77
73
	if [ -z "$LDAP_SECRET" ]; then
78
	if [ -z "$LDAP_SECRET" ]; then
74
		pw_crypt=$(mkpasswd --hash=md5 -s < /etc/ldap.secret)
79
		pw_crypt=$(mkpasswd --hash=md5 -s < /etc/ldap.secret)

Return to bug 34994