Commit 61a49ae

committed

Merge branch 'PHP-8.2'

* PHP-8.2: Attempt to improve setup-slapd.sh stability

2 parents 6091603 + 463e20b commit 61a49aeCopy full SHA for 61a49ae

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ if test -f "/etc/ldap/schema/ppolicy.ldif"; then`
`46`	`46`	`sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif`
`47`	`47`	`fi`
`48`	`48`
`49`		`-sudo service slapd restart`
`50`		`-`
`51`	`49`	`sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF`
`52`	`50`	`dn: $DBDN`
`53`	`51`	`changetype: modify`
`@@ -92,8 +90,6 @@ add: olcModuleLoad`
`92`	`90`	`olcModuleLoad: dds`
`93`	`91`	`EOF`
`94`	`92`
`95`		`-sudo service slapd restart`
`96`		`-`
`97`	`93`	`sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// << EOF`
`98`	`94`	`dn: olcOverlay=sssvlv,$DBDN`
`99`	`95`	`objectClass: olcOverlayConfig`
`@@ -118,17 +114,13 @@ objectClass: olcDdsConfig`
`118`	`114`	`olcOverlay: dds`
`119`	`115`	`EOF`
`120`	`116`
`121`		`-sudo service slapd restart`
`122`		`-`
`123`	`117`	`sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF`
`124`	`118`	`dn: $DBDN`
`125`	`119`	`changetype: modify`
`126`	`120`	`add: olcDbIndex`
`127`	`121`	`olcDbIndex: entryExpireTimestamp eq`
`128`	`122`	`EOF`
`129`	`123`
`130`		`-sudo service slapd restart`
`131`		`-`
`132`	`124`	`ldapadd -H ldapi:/// -D cn=Manager,dc=my-domain,dc=com -w secret <<EOF`
`133`	`125`	`dn: dc=my-domain,dc=com`
`134`	`126`	`objectClass: top`
`@@ -166,6 +158,8 @@ o: php ldap tests`
`166`	`158`	`## pwdSafeModify: FALSE`
`167`	`159`	`EOF`
`168`	`160`
	`161`	`+sudo service slapd restart`
	`162`	`+`
`169`	`163`	`# Verify TLS connection`
`170`	`164`	`tries=0`
`171`	`165`	`while : ; do`

Comments

(0)