diff --git a/README b/README index b9180db..766c6c5 100644 --- a/README +++ b/README @@ -1,3 +1,4 @@ +Outils pour support de SupAnn dans slapd (serveur OpenLDAP) Tools for SupAnn support in slapd (OpenLDAP server) Copyright (c) 2014 Entr'ouvert diff --git a/lib/newdb b/lib/newdb index ebed035..d154148 100755 --- a/lib/newdb +++ b/lib/newdb @@ -23,7 +23,7 @@ stty -echo read PASSWORD stty echo echo -echo "Une nouvelle fois:" +echo "Une nouvelle fois :" echo -n "-> " stty -echo read PASSWORD2 diff --git a/lib/newdb.help b/lib/newdb.help index 1374e26..98253db 100755 --- a/lib/newdb.help +++ b/lib/newdb.help @@ -1 +1 @@ -create a new database (for a new suffix) +création d'une nouvelle base, avec un nouveau suffixe diff --git a/lib/reset b/lib/reset index ecf1259..e2ab31e 100755 --- a/lib/reset +++ b/lib/reset @@ -5,29 +5,36 @@ set -e LDIFDIR=/usr/share/slapd-supann/ SERVICE="/usr/sbin/service slapd" -echo -n "WARNING! All current data will be erased. Are you sure? (type yes) " +echo "" +echo " *************" +echo " * * La configuration et toutes les données" +echo " * ATTENTION * de l'annuaire LDAP vont être définitivement" +echo " * * effacées. Avez-vous fait un backup ?" +echo " *************" + +echo "" +echo "Confirmez la MISE A ZÉRO COMPLÈTE de l'annuaire LDAP." +echo "" +echo -n "Tapez oui en toutes lettres : " read ok -if [ "x$ok" != "xyes" ]; then +if [ "x$ok" != "xoui" ]; then exit 3 fi ${SERVICE} stop || true -BACKUPDIR=/var/backups/slapd-reset-`date +%Y%m%dT%H%M%S` -echo -n "backup in $BACKUPDIR .." -mkdir -p ${BACKUPDIR} -cp -R /var/lib/ldap /etc/ldap/slapd.d/ ${BACKUPDIR} -echo "done" - -echo -n "erase config and data .." -rm -rf /var/lib/ldap/* /etc/ldap/slapd.d/* -mkdir /var/lib/ldap/config-accesslog/ +echo -n "Effacement de la configuration" +rm -rf /etc/ldap/slapd.d/* +echo -n " et des données .." +rm -rf /var/lib/ldap/* echo "ok" -echo "install new config .." +mkdir /var/lib/ldap/config-accesslog/ + +echo "Installation de la nouvelle configuration .." slapadd -n0 -F/etc/ldap/slapd.d -l${LDIFDIR}/config.ldif -echo "install schemas .." +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 @@ -40,7 +47,7 @@ chown -R openldap:openldap /etc/ldap/slapd.d /var/lib/ldap ${SERVICE} start if ! grep "^\s*profile\s\+config\s*$" /etc/ldapvi.conf > /dev/null 2>&1; then - echo "(add a 'profile config' in /etc/ldapvi.conf)" + echo "(ajout du 'profile config' dans /etc/ldapvi.conf)" cat << EOLDAPVI >> /etc/ldapvi.conf profile config diff --git a/lib/reset.help b/lib/reset.help index f7059c6..f22e57b 100644 --- a/lib/reset.help +++ b/lib/reset.help @@ -1 +1,5 @@ -erase all ldap data !!WARNING!! +mise à zéro complète + +Attention, cela efface complétement la configuration et +les données actuelles du serveur LDAP (slapd). + diff --git a/lib/restore b/lib/restore index 95de529..e73682d 100755 --- a/lib/restore +++ b/lib/restore @@ -8,37 +8,48 @@ SERVICE="/usr/sbin/service slapd" set -e if [ $# -ne 1 ]; then - echo "ERR: syntax: restore " + echo "ERR: syntaxe: restore " exit 1 fi BACKUPDIR=$1 shift if [ ! -d "$BACKUPDIR" -o ! -f "$BACKUPDIR/config.ldif" ]; then - echo "First argument must be a directory containing at least a config.ldif file" + echo "Le premier argument doit être un répertoire contenant au moins un fichier config.ldif" exit 2 fi -echo -n "WARNING! All current data will be erased. Are you sure? (type yes) " +echo "" +echo " *************" +echo " * * La configuration et toutes les données" +echo " * ATTENTION * de l'annuaire LDAP vont être définitivement" +echo " * * effacées. Avez-vous fait un backup ?" +echo " *************" + +echo "" +echo "Confirmez la MISE A ZÉRO COMPLÈTE avant restauration." +echo "" +echo -n "Tapez oui en toutes lettres : " read ok -if [ "x$ok" != "xyes" ]; then +if [ "x$ok" != "xoui" ]; then exit 3 fi ${SERVICE} stop -echo -n "erasing current datas .." +echo -n "Effacement des données actuelles .." rm -rf /etc/ldap/slapd.d/* find /var/lib/ldap -type f -delete +echo "ok" echo "" -echo "restoring config.ldif .." +echo "Restauration du config.ldif .." slapadd -n0 -F/etc/ldap/slapd.d/ -l"$BACKUPDIR/config.ldif" echo "" for i in `seq 1 $MAXDB`; do if [ -f "$BACKUPDIR/db-$i.ldif" ]; then - echo "restoring database $i .." + echo "Restauration de la base $i .." slapadd -n$i -F/etc/ldap/slapd.d/ -l"$BACKUPDIR/db-$i.ldif" fi done diff --git a/lib/restore.help b/lib/restore.help index 80b03b1..60da750 100755 --- a/lib/restore.help +++ b/lib/restore.help @@ -1,4 +1,4 @@ -restore all ldap database from +restauration des données depuis un répertoire -Beware all current data will be erased ! +Attention, la configuration et les données actuelles seront effacées ! diff --git a/lib/save b/lib/save index f0fea73..d6b8c42 100755 --- a/lib/save +++ b/lib/save @@ -6,7 +6,7 @@ MAXDB=30 if [ -n "$1" ]; then BASESAVEDIR="$1" if [ ! -d "$BASESAVEDIR" ]; then - echo "ERR: first argument must be an existing directory (is: $BASESAVEDIR)" + echo "ERR: le premier argument doit être un répertoire existant ($BASESAVEDIR)" exit 1 fi else @@ -15,29 +15,30 @@ fi SAVEDIR="${BASESAVEDIR}"/slapd-save-`date +%Y%m%dT%H%M%S` -echo "save slapd config and databases in ${SAVEDIR}" +echo "Sauvegarde de la configuration et des données slapd" +echo "dans le répertoire ${SAVEDIR}" mkdir -p "$SAVEDIR" -echo -n " export config in $SAVEDIR/config.ldif .." +echo -n " 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 database ${i} .." + echo -n " Export de le base ${i} .." if ! slapcat -n${i} -l"${SAVEDIR}"/db-${i}.ldif; then - echo "(none)" + echo "(vide)" true else echo "ok" fi done -echo "remove empty files .." +echo "Efface les fichiers vides .." find "${SAVEDIR}" -size 0 -delete echo "ok" echo "" -echo "${SAVEDIR} contents:" +echo "${SAVEDIR} contient :" ls -l "${SAVEDIR}" echo "" diff --git a/lib/save.help b/lib/save.help index 5c806ee..afe95e0 100755 --- a/lib/save.help +++ b/lib/save.help @@ -1 +1 @@ -save all ldap databases to /var/backups// +sauvegarde de la configuration et des données diff --git a/slapd-supann b/slapd-supann index 65ae8b1..0ecf360 100755 --- a/slapd-supann +++ b/slapd-supann @@ -7,9 +7,10 @@ test -d ${COMMANDDIR} || COMMANDDIR=/usr/lib/`basename $0` help() { msg="$1" test -n "$msg" && echo $msg - echo "syntax: $ME command ..." + echo "syntaxe: $ME commande ..." echo "" - echo "available commands:" + echo "commandes disponibles:" + echo " help cette aide" for fcom in $COMMANDDIR/*.help do com=`basename $fcom .help` @@ -23,13 +24,13 @@ help() { helpcmd() { command=$1 xcommand=$COMMANDDIR/$command - test -x $xcommand || help "ERR: unknown command ($command)" + test -x $xcommand || help "ERR: commande inconnue ($command)" echo "$ME $command" cat $xcommand.help } command=$1 -test -z $command && help "ERR: missing command" +test -z $command && help "ERR: commande manquante" shift case $command in @@ -39,7 +40,7 @@ case $command in ;; *) xcommand=$COMMANDDIR/$command - test -x $xcommand || help "ERR: unknown command ($command)" + test -x $xcommand || help "ERR: commande inconnue ($command)" $xcommand "$@" ;; esac diff --git a/slapd-supann.1 b/slapd-supann.1 index 2038725..2ff49e3 100644 --- a/slapd-supann.1 +++ b/slapd-supann.1 @@ -17,8 +17,8 @@ .\" .br insert line break .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) -.SH NAME -slapd-supann \- manage OpenLDAP server (slapd) with SupAnn flavor +.SH NOM +slapd-supann \- gestion SupAnn du serveur OpenLDAP (slapd) .SH SYNOPSIS .B slapd-supann .RI @@ -28,9 +28,9 @@ slapd-supann \- manage OpenLDAP server (slapd) with SupAnn flavor .RI [command] .SH DESCRIPTION .B slapd-supann -offers a set of commands to manage a slapd (OpenLDAP server), -according to SupAnn standard. -.SH SEE ALSO +propose un ensemble de commande pour gérer un annuaire OpenLDAP +(slapd) selon les recommandations SupAnn 2009 +.SH VOIR AUSSI .BR slapd (8), .BR ldapsearch (1), .BR ldapvi (1)