Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to openldap 2.5+ #42

Merged
merged 21 commits into from
Dec 15, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
override_dh_auto_install:
$(MAKE) prefix=debian/bdii install
slapd_modulepath="modulepath /usr/lib/ldap" ; \
slapd_moduleload="moduleload back_hdb" ; \
slapd_moduleload="moduleload back_mdb" ; \
gwarf marked this conversation as resolved.
Show resolved Hide resolved
sed -e "/allow bind_v2/i$${slapd_modulepath}\n$${slapd_moduleload}" \
-e "s!etc/openldap/schema!etc/ldap/schema!" \
-i debian/bdii/etc/bdii/bdii-slapd.conf ; \
Expand Down
9 changes: 3 additions & 6 deletions etc/bdii-slapd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ moduleload back_relay
# GLUE 1.3 database definitions
#######################################################################

database hdb
database mdb
suffix "o=grid"
cachesize 30000
checkpoint 1024 0
dbnosync
rootdn "o=grid"
Expand Down Expand Up @@ -78,9 +77,8 @@ suffixmassage "GLUE2GroupID=resource,GLUE2DomainID=*,GLUE2GroupID=grid,o=glue"
# GLUE 2.0 database definitions
#######################################################################

database hdb
database mdb
suffix "o=glue"
cachesize 30000
checkpoint 1024 0
dbnosync
rootdn "o=glue"
Expand Down Expand Up @@ -114,9 +112,8 @@ index objectClass eq,pres
#######################################################################
# Stats database definitions
#######################################################################
database hdb
database mdb
suffix "o=infosys"
cachesize 10
checkpoint 1024 0
dbnosync
rootdn "o=infosys"
Expand Down
9 changes: 3 additions & 6 deletions etc/bdii-top-slapd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ moduleload back_relay
# GLUE 1.3 database definitions
#######################################################################

database hdb
cachesize 300000
database mdb
dbnosync
suffix "o=shadow"
checkpoint 1024 0
Expand Down Expand Up @@ -87,8 +86,7 @@ suffixmassage "GLUE2GroupID=resource,GLUE2DomainID=*,GLUE2GroupID=grid,o=glue"
# GLUE 2.0 database definitions
#######################################################################

database hdb
cachesize 300000
database mdb
dbnosync
suffix "o=glue"
checkpoint 1024 0
Expand Down Expand Up @@ -123,8 +121,7 @@ index objectClass eq,pres
#######################################################################
# Stats database definitions
#######################################################################
database hdb
cachesize 10
database mdb
dbnosync
suffix "o=infosys"
checkpoint 1024 0
Expand Down
2 changes: 1 addition & 1 deletion man/bdii-update.1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ directory and running plugins found in the
.B plugin
directory.
The difference between providers and plugins is that providers return complete entries and plugins provide modifications to existing entries.
The process can be run either as a daemon that periodically syncronizes an LDAP database or as a command that will print the result to stdout.
The process can be run either as a daemon that periodically synchronizes an LDAP database or as a command that will print the result to stdout.
.SH OPTIONS
.IP -d
Run as a daemon process.
Expand Down