From 20ac1eb1fc3caf36bce7e681cc60b388ba28381e Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Tue, 4 Jul 2023 09:45:35 +0200
Subject: [PATCH] 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.
---
 .github/scripts/setup-slapd.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/setup-slapd.sh b/.github/scripts/setup-slapd.sh
index b9cb1a4ff7a95..ec0b2d3060445 100755
--- a/.github/scripts/setup-slapd.sh
+++ b/.github/scripts/setup-slapd.sh
@@ -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