Skip to content

Commit b793936

Browse files
BertrandGounyBertrandGouny
committed
refacto
1 parent 222c55a commit b793936

File tree

4 files changed

+96
-10
lines changed

4 files changed

+96
-10
lines changed

‎image/service/slapd/assets/config/bootstrap/index.ldif‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
dn: olcDatabase={1}hdb,cn=config
2-
add: olcDbIndex
3-
olcDbIndex: uid eq,pres,sub
2+
changetype: modify
3+
replace: olcDbIndex
4+
olcDbIndex: entryCSN eq
5+
olcDbIndex: entryUUID eq

‎image/service/slapd/assets/config/replication/replication-enable.ldif‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,81 @@
1+
# Load syncprov module
2+
dn: cn=module{0},cn=config
3+
changetype: modify
4+
add: olcModuleLoad
5+
olcModuleLoad: syncprov
6+
7+
# Set server ID
8+
dn: cn=config
9+
changeType: modify
10+
add: olcServerID
11+
olcServerID: {{ SERVER_ID }}
12+
13+
# Set config password
14+
dn: cn=config
15+
changeType: modify
16+
17+
dn: olcDatabase={0}config,cn=config
18+
add: olcRootPW
19+
olcRootPW: {{ CONFIG_PASSWORD_ENCRYPTED }}
20+
21+
# Add config replication
22+
dn: cn=config
23+
changetype: modify
24+
replace: olcServerID
25+
olcServerID: 1 ldap://ldap1.gremaud.local
26+
olcServerID: 2 ldap://ldap2.gremaud.local
27+
olcServerID: 3 ldap://ldap3.gremaud.local
28+
{{ REPLICATION_SERVERS }}
29+
30+
# Add syncprov on config
31+
dn: olcOverlay=syncprov,olcDatabase={0}config,cn=config
32+
changetype: add
33+
objectClass: olcOverlayConfig
34+
objectClass: olcSyncProvConfig
35+
olcOverlay: syncprov
36+
37+
# Add sync replication on config
38+
dn: olcDatabase={0}config,cn=config
39+
changetype: modify
40+
add: olcSyncRepl
41+
olcSyncRepl: rid=001 provider=ldap://ldap1.gremaud.local binddn="cn=admin,cn=config" bindmethod=simple credentials=secret searchbase="cn=config" type=refreshAndPersist retry="5 5 300 5" timeout=1
42+
olcSyncRepl: rid=002 provider=ldap://ldap2.gremaud.local binddn="cn=admin,cn=config" bindmethod=simple credentials=secret searchbase="cn=config" type=refreshAndPersist retry="5 5 300 5" timeout=1
43+
olcSyncRepl: rid=003 provider=ldap://ldap3.gremaud.local binddn="cn=admin,cn=config" bindmethod=simple credentials=secret searchbase="cn=config" type=refreshAndPersist retry="5 5 300 5" timeout=1
44+
{{ REPLICATION_SERVERS_CONFIG_SYNC_REPL }}
45+
-
46+
add: olcMirrorMode
47+
olcMirrorMode: TRUE
48+
49+
# Add syncprov on hdb
50+
dn: olcOverlay=syncprov,olcDatabase={1}hdb,cn=config
51+
changetype: add
52+
objectClass: olcOverlayConfig
53+
objectClass: olcSyncProvConfig
54+
olcOverlay: syncprov
55+
56+
# Add sync replication on hdb
57+
dn: olcDatabase={1}hdb,cn=config
58+
changetype: modify
59+
add: olcSyncRepl
60+
olcSyncRepl: rid=101 provider=ldap://ldap1.gremaud.local binddn="cn=admin,dc=gremaud,dc=local" bindmethod=simple credentials=secret searchbase="dc=gremaud,dc=local" type=refreshAndPersist interval=00:00:00:10 retry="5 5 300 5" timeout=1
61+
olcSyncRepl: rid=102 provider=ldap://ldap2.gremaud.local binddn="cn=admin,dc=gremaud,dc=local" bindmethod=simple credentials=secret searchbase="dc=gremaud,dc=local" type=refreshAndPersist interval=00:00:00:10 retry="5 5 300 5" timeout=1
62+
olcSyncRepl: rid=103 provider=ldap://ldap3.gremaud.local binddn="cn=admin,dc=gremaud,dc=local" bindmethod=simple credentials=secret searchbase="dc=gremaud,dc=local" type=refreshAndPersist interval=00:00:00:10 retry="5 5 300 5" timeout=1
63+
{{ REPLICATION_SERVERS_HDB_SYNC_REPL }}
64+
65+
# Add olcMirrorMode
66+
dn: olcDatabase={1}hdb,cn=config
67+
changetype: modify
68+
add: olcMirrorMode
69+
olcMirrorMode: TRUE
70+
71+
# Add indexes
72+
dn: olcDatabase={1}hdb,cn=config
73+
changetype: modify
74+
replace: olcDbIndex
75+
olcDbIndex: entryCSN eq
76+
olcDbIndex: entryUUID eq
77+
78+
179
# Add indexes to the frontend db.
280
dn: olcDatabase={1}hdb,cn=config
381
changetype: modify

‎image/service/slapd/assets/schema/README.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎image/service/slapd/container-start.sh‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ EOF
142142
sed -i "s|dc=example,dc=org|$BASE_DN|g" /osixia/slapd/config/bootstrap/security.ldif
143143

144144
# process config files
145-
for f in $(find /osixia/slapd/config/bootstrap -name \*.ldif -type f); do
145+
for f in $(find /osixia/slapd/config/bootstrap -path /osixia/slapd/config/bootstrap/schema -prune -name \*.ldif -type f); do
146146
echo "Processing file ${f}"
147147
ldapmodify -Y EXTERNAL -Q -H ldapi:/// -f $f
148148
done
@@ -152,6 +152,8 @@ EOF
152152
# TLS config
153153
if [ "${USE_TLS,,}" == "true" ]; then
154154

155+
echo "Use TLS"
156+
155157
check_tls_files $SSL_CA_CRT_FILENAME $SSL_CRT_FILENAME $SSL_KEY_FILENAME
156158

157159
# adapt tls ldif
@@ -177,6 +179,8 @@ EOF
177179

178180
else
179181

182+
echo "Don't use TLS"
183+
180184
[[ -f "$WAS_STARTED_WITH_TLS" ]] && rm -f "$WAS_STARTED_WITH_TLS"
181185
ldapmodify -c -Y EXTERNAL -Q -H ldapi:/// -f /osixia/slapd/config/tls/tls-disable.ldif || true
182186

@@ -186,17 +190,20 @@ EOF
186190
# replication config
187191
if [ "${USE_REPLICATION,,}" == "true" ]; then
188192

193+
echo "Set replication"
189194

190-
cp /var/lib/ldap/DB_CONFIG /var/lib/ldap/accesslog
191-
chown openldap:openldap /var/lib/ldap/accesslog
195+
#cp /var/lib/ldap/DB_CONFIG /var/lib/ldap/accesslog
196+
#chown openldap:openldap /var/lib/ldap/accesslog
192197

193198
else
194199

200+
echo "Don't set replication"
201+
195202
# disable replication
196-
for f in $(find /osixia/slapd/config/replication -name \*-disable.ldif -type f); do
197-
echo "Processing file ${f}"
198-
ldapmodify -Y EXTERNAL -Q -H ldapi:/// -f $f
199-
done
203+
#for f in $(find /osixia/slapd/config/replication -name \*-disable.ldif -type f); do
204+
# echo "Processing file ${f}"
205+
# ldapmodify -Y EXTERNAL -Q -H ldapi:/// -f $f
206+
# done
200207

201208
fi
202209

0 commit comments

Comments
 (0)