save/restore: certif ssl dans /etc/ldap/ssl

lib/reset

@@ -44,11 +44,11 @@ fi
 mkdir -p /etc/ldap/slapd.d
 mkdir /var/lib/ldap/config-accesslog/ /var/lib/ldap/meta/
 
-echo -n "Installation de la nouvelle configuration .. "
+echo "Installation de la nouvelle configuration .. "
 slapadd -n0 -F/etc/ldap/slapd.d -l${LDIFDIR}/config.ldif
 echo "ok"
 
-echo -n "Installation des schémas .. "
+echo "Installation des schémas .. "
 slapadd -n0 -F/etc/ldap/slapd.d -l/etc/ldap/schema/core.ldif
 slapadd -n0 -F/etc/ldap/slapd.d -l/etc/ldap/schema/cosine.ldif
 slapadd -n0 -F/etc/ldap/slapd.d -l/etc/ldap/schema/inetorgperson.ldif

lib/restore

@@ -43,12 +43,17 @@ find /var/lib/ldap -type f -delete
 echo "ok"
 
 echo ""
-echo -n "Restauration du config.ldif .."
+echo "Restauration du config.ldif .."
 slapadd -n0 -F/etc/ldap/slapd.d/ -l"$BACKUPDIR/config.ldif"
 
 echo ""
-echo -n "Restauration des certificats SSL .."
-cp $BACKUPDIR/ssl.pem $BACKUPDIR/ssl.key /var/lib/ldap
+echo "Restauration des certificats SSL .."
+mkdir /etc/ldap/ssl
+cp $BACKUPDIR/slapd.pem $BACKUPDIR/slapd.key /etc/ldap/ssl
+chown -R root:openldap /etc/ldap/ssl
+chmod 0755 /etc/ldap/ssl
+chmod 0644 /etc/ldap/ssl/slapd.pem
+chmod 0640 /etc/ldap/ssl/slapd.key
 echo "ok"
 
 echo ""

lib/save

@@ -20,12 +20,12 @@ echo "dans le répertoire ${SAVEDIR}"
 
 mkdir -p "$SAVEDIR"
 
-echo -n "  Export de la configuration dans $SAVEDIR/config.ldif .."
+echo "  Export de la configuration dans $SAVEDIR/config.ldif .."
 slapcat -n0 -l"${SAVEDIR}"/config.ldif
 echo "ok"
 
 for i in `seq 1 $MAXDB`; do
-	echo -n "  Export de le base ${i} .."
+	echo "  Export de le base ${i} .."
 	if ! slapcat -n${i} -l"${SAVEDIR}"/db-${i}.ldif; then
 		echo "(vide)"
 		true
@@ -35,7 +35,7 @@ for i in `seq 1 $MAXDB`; do
 done
 
 echo -n "Sauvegarde des certificats SSL .."
-cp /var/lib/ldap/ssl.key /var/lib/ldap/ssl.pem ${SAVEDIR}
+cp /etc/ldap/ssl/slapd.key /etc/ldap/ssl/slapd.pem ${SAVEDIR}
 echo "ok"
 
 echo "Efface les fichiers vides .."