archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Attempt to improve setup-slapd.sh stability

Browse source 
Don't restart multiple times, restart at the end where we already have a retry
loop with a small delay.

Closes GH-11590
This commit is contained in:
Ilija Tovilo 2023-07-04 09:45:35 +02:00
parent 46e9c5104c
commit 4cc800fcb4
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/scripts/setup-slapd.sh vendored
View file

@ -44,8 +44,6 @@ DBDN=`sudo ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(&(olcRootD
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
sudo service slapd restart
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
dn: $DBDN
changetype: modify
@ -90,8 +88,6 @@ add: olcModuleLoad
olcModuleLoad: dds
EOF
sudo service slapd restart
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// << EOF
dn: olcOverlay=sssvlv,$DBDN
objectClass: olcOverlayConfig
@ -116,8 +112,6 @@ objectClass: olcDdsConfig
olcOverlay: dds
EOF
sudo service slapd restart
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
dn: $DBDN
changetype: modify
@ -125,8 +119,6 @@ add: olcDbIndex
olcDbIndex: entryExpireTimestamp eq
EOF
sudo service slapd restart
ldapadd -H ldapi:/// -D cn=Manager,dc=my-domain,dc=com -w secret <<EOF
dn: dc=my-domain,dc=com
objectClass: top
@ -164,6 +156,8 @@ o: php ldap tests
## pwdSafeModify: FALSE
EOF
sudo service slapd restart
# Verify TLS connection
tries=0
while : ; do