Skip to content

Commit 61a49ae

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Attempt to improve setup-slapd.sh stability
2 parents 6091603 + 463e20b commit 61a49ae

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
@@ -46,8 +46,6 @@ if test -f "/etc/ldap/schema/ppolicy.ldif"; then
4646
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
4747
fi
4848

49-
sudo service slapd restart
50-
5149
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
5250
dn: $DBDN
5351
changetype: modify
@@ -92,8 +90,6 @@ add: olcModuleLoad
9290
olcModuleLoad: dds
9391
EOF
9492

95-
sudo service slapd restart
96-
9793
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// << EOF
9894
dn: olcOverlay=sssvlv,$DBDN
9995
objectClass: olcOverlayConfig
@@ -118,17 +114,13 @@ objectClass: olcDdsConfig
118114
olcOverlay: dds
119115
EOF
120116

121-
sudo service slapd restart
122-
123117
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
124118
dn: $DBDN
125119
changetype: modify
126120
add: olcDbIndex
127121
olcDbIndex: entryExpireTimestamp eq
128122
EOF
129123

130-
sudo service slapd restart
131-
132124
ldapadd -H ldapi:/// -D cn=Manager,dc=my-domain,dc=com -w secret <<EOF
133125
dn: dc=my-domain,dc=com
134126
objectClass: top
@@ -166,6 +158,8 @@ o: php ldap tests
166158
## pwdSafeModify: FALSE
167159
EOF
168160

161+
sudo service slapd restart
162+
169163
# Verify TLS connection
170164
tries=0
171165
while : ; do

0 commit comments

Comments
 (0)