Skip to content

Commit 4cc800f

Browse files
committed
Attempt to improve setup-slapd.sh stability
Don't restart multiple times, restart at the end where we already have a retry loop with a small delay. Closes GH-11590
1 parent 46e9c51 commit 4cc800f

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.github/scripts/setup-slapd.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ DBDN=`sudo ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(&(olcRootD
4444

4545
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
4646

47-
sudo service slapd restart
48-
4947
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
5048
dn: $DBDN
5149
changetype: modify
@@ -90,8 +88,6 @@ add: olcModuleLoad
9088
olcModuleLoad: dds
9189
EOF
9290

93-
sudo service slapd restart
94-
9591
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// << EOF
9692
dn: olcOverlay=sssvlv,$DBDN
9793
objectClass: olcOverlayConfig
@@ -116,17 +112,13 @@ objectClass: olcDdsConfig
116112
olcOverlay: dds
117113
EOF
118114

119-
sudo service slapd restart
120-
121115
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
122116
dn: $DBDN
123117
changetype: modify
124118
add: olcDbIndex
125119
olcDbIndex: entryExpireTimestamp eq
126120
EOF
127121

128-
sudo service slapd restart
129-
130122
ldapadd -H ldapi:/// -D cn=Manager,dc=my-domain,dc=com -w secret <<EOF
131123
dn: dc=my-domain,dc=com
132124
objectClass: top
@@ -164,6 +156,8 @@ o: php ldap tests
164156
## pwdSafeModify: FALSE
165157
EOF
166158

159+
sudo service slapd restart
160+
167161
# Verify TLS connection
168162
tries=0
169163
while : ; do

0 commit comments

Comments
 (0)