Attachment 150447 Details for Bug 233027 – cvs diff template-db2bak.in, template-db2bak.pl.in, template-db2ldif.in

[patch] cvs diff template-db2bak.in, template-db2bak.pl.in, template-db2ldif.in

util3.diffs (text/plain), 4.59 KB, created by Noriko Hosoi on 2007-03-20 00:39:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-03-20 00:39:46 UTC

Size: 4.59 KB

patch

obsolete

>Index: template-db2bak.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.in,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 template-db2bak.in
>--- template-db2bak.in	12 Feb 2007 19:55:10 -0000	1.5
>+++ template-db2bak.in	20 Mar 2007 00:33:54 -0000
>@@ -16,8 +16,9 @@
> if [ "$#" -eq 1 ]
> 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
>diff -t -w -U4 -r1.6 template-db2bak.pl.in
>--- template-db2bak.pl.in	19 Mar 2007 23:01:39 -0000	1.6
>+++ template-db2bak.pl.in	20 Mar 2007 00:33:54 -0000
>@@ -104,9 +104,9 @@
> ($s, $m, $h, $dy, $mn, $yr, $wdy, $ydy, $r) = localtime(time);
> $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";
> $cn = "cn: $taskname\n";
>Index: template-db2ldif.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.in,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 template-db2ldif.in
>--- template-db2ldif.in	12 Feb 2007 19:55:10 -0000	1.5
>+++ template-db2ldif.in	20 Mar 2007 00:33:54 -0000
>@@ -11,8 +11,49 @@
> export LD_LIBRARY_PATH
> 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}*"
>@@ -21,26 +62,13 @@
>         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
> ./ns-slapd db2ldif -D {{CONFIG-DIR}} -a $ldif_file "$@"
>Index: template-db2ldif.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.pl.in,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 template-db2ldif.pl.in
>--- template-db2ldif.pl.in	19 Mar 2007 23:01:39 -0000	1.5
>+++ template-db2ldif.pl.in	20 Mar 2007 00:33:54 -0000
>@@ -229,10 +229,14 @@
>         $nsexcluded = "${nsexcluded}nsExcludeSuffix: $excluded[$i]\n";
>         $i++;
> }
> if ($ldiffile eq "") {
>+        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"; }
> $nsnobase64 = "";
> if ($nobase64 != 0) { $nsnobase64 = "nsMinimalEncoding: true\n"; }

Actions: View | Diff

Attachments on bug 233027: 150442 | 150443 | 150447 | 150451 | 150717 | 150813 | 151242