[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-db2bak.in, 1.5, 1.6 template-db2bak.pl.in, 1.6, 1.7 template-db2ldif.in, 1.5, 1.6 template-db2ldif.pl.in, 1.5, 1.6
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Tue Mar 20 01:15:34 UTC 2007
- Previous message (by thread): [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-db2bak.pl.in, 1.5, 1.6 template-db2ldif.pl.in, 1.4, 1.5
- Next message (by thread): [Fedora-directory-commits] ldapserver configure.ac, 1.24, 1.25 aclocal.m4, 1.27, 1.28 configure, 1.36, 1.37 missing, 1.21, 1.22 install-sh, 1.21, 1.22 depcomp, 1.21, 1.22 compile, 1.21, 1.22 Makefile.in, 1.39, 1.40 config.sub, 1.20, 1.21 config.guess, 1.20, 1.21 ltmain.sh, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8852
Modified Files:
template-db2bak.in template-db2bak.pl.in template-db2ldif.in
template-db2ldif.pl.in
Log Message:
Resolves: #233027
Summary: make db2bak.pl & db2ldif.pl user more user-friendly (Comment #4)
Changes:
1) Found db2bak, db2bak.pl, and db2ldif do not backup/export into the dir/file
which do not start with the <server-id> string. It could cause the difficulty
to find out which server instance does the backup/exported file belongs to.
Also, to make them consistent with db2ldif.pl, added the "server id" string to
the back up dir name/exported ldif file name.
2) db2ldif[.pl] takes -M option. With the -M option, the server adds backend
name to the ldif file name. To reduce the redundancy, stopped adding the
backend name if -M is set.
3) made the ldif file name db2ldif generates consistent with the one db2ldif.pl
generates.
Index: template-db2bak.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-db2bak.in 12 Feb 2007 19:55:10 -0000 1.5
+++ template-db2bak.in 20 Mar 2007 01:15:32 -0000 1.6
@@ -17,7 +17,8 @@
then
bak_dir=$1
else
- bak_dir={{BAK-DIR}}/`date +%Y_%m_%d_%H_%M_%S`
+ bak_dir={{BAK-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H_%M_%S`
fi
+echo "Back up directory: $bak_dir"
./ns-slapd db2archive -D {{CONFIG-DIR}} -a $bak_dir
Index: template-db2bak.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.pl.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-db2bak.pl.in 19 Mar 2007 23:01:39 -0000 1.6
+++ template-db2bak.pl.in 20 Mar 2007 01:15:32 -0000 1.7
@@ -105,7 +105,7 @@
$mn++; $yr += 1900;
$taskname = "backup_${yr}_${mn}_${dy}_${h}_${m}_${s}";
if ($archivedir eq "") {
- $archivedir = "${mybakdir}{{SEP}}${yr}_${mn}_${dy}_${h}_${m}_${s}";
+ $archivedir = "${mybakdir}{{SEP}}{{SERV-ID}}-${yr}_${mn}_${dy}_${h}_${m}_${s}";
}
$dn = "dn: cn=$taskname, cn=backup, cn=tasks, cn=config\n";
$misc = "changetype: add\nobjectclass: top\nobjectclass: extensibleObject\n";
Index: template-db2ldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-db2ldif.in 12 Feb 2007 19:55:10 -0000 1.5
+++ template-db2ldif.in 20 Mar 2007 01:15:32 -0000 1.6
@@ -12,34 +12,62 @@
SHLIB_PATH=$LD_LIBRARY_PATH
export SHLIB_PATH
+make_ldiffile()
+{
+ nobe=0
+ while [ "$1" != "" ]
+ do
+ if [ "$1" = '-a' ]; then
+ shift
+ echo $1
+ return 1
+ elif [ "$1" = '-n' ]; then
+ shift
+ if [ "$be" = "" ]; then
+ be="$1"
+ else
+ tmpbe="$be"
+ be="${tmpbe}-$1"
+ fi
+ elif [ "$1" = '-s' ]; then
+ shift
+ rdn=`echo $1 | awk -F, '{print $1}'`
+ rdnval=`echo $rdn | awk -F= '{print $2}'`
+ if [ "$be" = "" ]; then
+ be="$rdnval"
+ else
+ tmpbe="$be"
+ be="${tmpbe}-$rdnval"
+ fi
+ elif [ "$1" = '-M' ]; then
+ nobe=1
+ fi
+ shift
+ done
+
+ if [ $nobe -eq 0 ]; then
+ echo {{LDIF-DIR}}/{{SERV-ID}}-${be}-`date +%Y_%m_%d_%H%M%S`.ldif
+ else
+ echo {{LDIF-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H%M%S`.ldif
+ fi
+ return 0
+}
+
cd {{SERVERBIN-DIR}}
if [ "$#" -lt 2 ];
then
- echo "Usage: db2ldif {-n backend_instance}* | {-s includesuffix}*"
- echo " [{-x excludesuffix}*] [-a outputfile]"
- echo " [-N] [-r] [-C] [-u] [-U] [-m] [-M] [-1]"
- echo "Note: either \"-n backend_instance\" or \"-s includesuffix\" is required."
- exit 1
+ echo "Usage: db2ldif {-n backend_instance}* | {-s includesuffix}*"
+ echo " [{-x excludesuffix}*] [-a outputfile]"
+ echo " [-N] [-r] [-C] [-u] [-U] [-m] [-M] [-1]"
+ echo "Note: either \"-n backend_instance\" or \"-s includesuffix\" is required."
+ exit 1
fi
-set_ldif=0
-ldif_file="mydummy"
-for arg in "$@"
-do
- if [ "$arg" = '-a' ];
- then
- set_ldif=1
- elif [ $set_ldif -eq 1 ];
- then
- ldif_file=$arg
- set_ldif=2
- fi
-done
-if [ $ldif_file = "mydummy" ]
-then
- ldif_file={{LDIF-DIR}}/`date +%Y_%m_%d_%H%M%S`.ldif
-fi
-if [ $set_ldif -eq 2 ]
+ldif_file=`make_ldiffile $@`
+rn=$?
+
+echo "Exported ldif file: $ldif_file"
+if [ $rn -eq 1 ]
then
./ns-slapd db2ldif -D {{CONFIG-DIR}} "$@"
else
Index: template-db2ldif.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.pl.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-db2ldif.pl.in 19 Mar 2007 23:01:39 -0000 1.5
+++ template-db2ldif.pl.in 20 Mar 2007 01:15:32 -0000 1.6
@@ -230,7 +230,11 @@
$i++;
}
if ($ldiffile eq "") {
- $ldiffile = "${ldifdir}{{SEP}}${servid}-${be}-${yr}_${mn}_${dy}_${h}_${m}_${s}.ldif";
+ if ($onefile == 0) {
+ $ldiffile = "${ldifdir}{{SEP}}${servid}-${yr}_${mn}_${dy}_${h}_${m}_${s}.ldif";
+ } else {
+ $ldiffile = "${ldifdir}{{SEP}}${servid}-${be}-${yr}_${mn}_${dy}_${h}_${m}_${s}.ldif";
+ }
}
$nsreplica = "";
if ($doreplica != 0) { $nsreplica = "nsExportReplica: true\n"; }
- Previous message (by thread): [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-db2bak.pl.in, 1.5, 1.6 template-db2ldif.pl.in, 1.4, 1.5
- Next message (by thread): [Fedora-directory-commits] ldapserver configure.ac, 1.24, 1.25 aclocal.m4, 1.27, 1.28 configure, 1.36, 1.37 missing, 1.21, 1.22 install-sh, 1.21, 1.22 depcomp, 1.21, 1.22 compile, 1.21, 1.22 Makefile.in, 1.39, 1.40 config.sub, 1.20, 1.21 config.guess, 1.20, 1.21 ltmain.sh, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list