|
 |
61f723 |
From cdcc387f6f1287da1edda418d746e6c2c772e5bd Mon Sep 17 00:00:00 2001
|
|
|
61f723 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
61f723 |
Date: Thu, 4 May 2017 15:44:51 -0400
|
|
|
61f723 |
Subject: [PATCH] Ticket 49241 - Update man page and usage for db2bak.pl
|
|
|
61f723 |
|
|
|
61f723 |
Description: The usage and man page should state thtthe backup directory
|
|
|
61f723 |
is actually a symlink to the the server's backup directory.
|
|
|
61f723 |
Otherwise it is misleading, and could eventaully lead to
|
|
|
61f723 |
diskspace issues.
|
|
|
61f723 |
|
|
|
61f723 |
https://pagure.io/389-ds-base/issue/49241
|
|
|
61f723 |
|
|
|
61f723 |
Reviewed by: firstyear(Thanks!)
|
|
|
61f723 |
|
|
|
61f723 |
(cherry picked from commit 0804c43991fa29ef7bd946b3e5a37844e2b87da4)
|
|
|
61f723 |
---
|
|
|
61f723 |
ldap/admin/src/scripts/db2bak.pl.in | 4 ++--
|
|
|
61f723 |
man/man8/db2bak.pl.8 | 2 +-
|
|
|
61f723 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
61f723 |
|
|
|
61f723 |
diff --git a/ldap/admin/src/scripts/db2bak.pl.in b/ldap/admin/src/scripts/db2bak.pl.in
|
|
|
61f723 |
index c73caa1..73d4187 100644
|
|
|
61f723 |
--- a/ldap/admin/src/scripts/db2bak.pl.in
|
|
|
61f723 |
+++ b/ldap/admin/src/scripts/db2bak.pl.in
|
|
|
61f723 |
@@ -33,8 +33,8 @@ sub usage {
|
|
|
61f723 |
print(STDERR " -w - - Prompt for Directory Manager's password\n");
|
|
|
61f723 |
print(STDERR " -Z serverID - Server instance identifier\n");
|
|
|
61f723 |
print(STDERR " -j filename - Read Directory Manager's password from file\n");
|
|
|
61f723 |
- print(STDERR " -A backupdir - Backup directory (backupdir/ID-<date_time>)\n");
|
|
|
61f723 |
- print(STDERR " -a backupdir - Backup directory\n");
|
|
|
61f723 |
+ print(STDERR " -A backupdir - Backup directory symlink(backupdir/ID-<date_time>)\n");
|
|
|
61f723 |
+ print(STDERR " -a backupdir - Backup directory symlink\n");
|
|
|
61f723 |
print(STDERR " -t dbtype - Database type (default: ldbm database)\n");
|
|
|
61f723 |
print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n");
|
|
|
61f723 |
print(STDERR " -h - Display usage\n");
|
|
|
61f723 |
diff --git a/man/man8/db2bak.pl.8 b/man/man8/db2bak.pl.8
|
|
|
61f723 |
index a752885..c51ccae 100644
|
|
|
61f723 |
--- a/man/man8/db2bak.pl.8
|
|
|
61f723 |
+++ b/man/man8/db2bak.pl.8
|
|
|
61f723 |
@@ -47,7 +47,7 @@ The name of the file that contains the root DN password.
|
|
|
61f723 |
The backend database type (default: ldbm database).
|
|
|
61f723 |
.TP
|
|
|
61f723 |
.B \fB\-a\fR \fIbackupdir\fR
|
|
|
61f723 |
-The directory where the backup should be stored.
|
|
|
61f723 |
+The directory where the backup should be stored. This directory is a symbolic link to the actual backup files located under "nsslapd-bakdir" directory that is set in the "cn=config" entry.
|
|
|
61f723 |
.TP
|
|
|
61f723 |
.B \fB\-A\fR \fIbackupdir\fR
|
|
|
61f723 |
This is similar to \fB-a\fR, except that a sub-directory of \fIbackupdir\fR will be created for the backup, and the name of the sub-directory will be a timestamp of the form \fIserver-instance-date_time\fR.
|
|
|
61f723 |
--
|
|
|
61f723 |
2.9.3
|
|
|
61f723 |
|