Merge pull request #182 from VinceMacBuche/bug/4132/always_restart_slapd

Ref #4132: slapd always restarted
Normation · Nov 6, 2013 · 649cfd8 · 649cfd8
2 parents 865ca8e + 0a05e15
commit 649cfd8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec b/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec
@@ -305,8 +305,10 @@ if [ -r /opt/rudder/etc/openldap/slapd.conf -a -e /var/rudder/ldap/openldap-data
 	fi
 fi
 
-echo "All done. Starting slapd..."
-/etc/init.d/slapd start
+# Need to restart to take schema changes into account
+echo -n "INFO: Restarting slapd..."
+/sbin/service slapd restart >/dev/null 2>&1
+echo " Done"
 
 #=================================================
 # Cleaning

diff --git a/rudder-inventory-ldap/debian/postinst b/rudder-inventory-ldap/debian/postinst
@@ -131,6 +131,12 @@ case "$1" in
 				echo "OpenLDAP indexes updated."
 			fi
 		fi
+
+		# Restart slapd to take schema changes into account
+		echo -n "INFO: Restarting slapd..."
+		invoke-rc.d slapd restart >/dev/null 2>&1
+		echo " Done"
+
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)