Makefile.am | 4 ++-
Makefile.in | 4 ++-
VERSION.sh | 2 -
admserv/makeUpgradeTar.sh | 7 +++++
man/man8/ds_removal.8 | 54 ++++++++++++++++++++++++++++++++++++++++++++++
man/man8/ds_unregister.8 | 48 ++++++++++++++++++++++++++++++++++++++++
6 files changed, 115 insertions(+), 4 deletions(-)
New commits:
commit aefc3edb547200c53cd47c900f8bd6214c33f028
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Aug 11 14:33:19 2011 -0600
bump version to 1.1.23
diff --git a/VERSION.sh b/VERSION.sh
index 491f3c5..f75e179 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -11,7 +11,7 @@
vendorurl=http://port389.org
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=1
-VERSION_MAINT=22
+VERSION_MAINT=23
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit b989b0974d36303567c1d489a5aa1ca6cb5363df
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Aug 11 08:24:57 2011 -0600
fix binary paths
diff --git a/admserv/makeUpgradeTar.sh b/admserv/makeUpgradeTar.sh
index 51c5790..979dd64 100755
--- a/admserv/makeUpgradeTar.sh
+++ b/admserv/makeUpgradeTar.sh
@@ -11,7 +11,7 @@ if [ -f "$1" ] ; then
fi
if [ -n "$2" ] ; then
- dbfiles="var/lib/dirsrv/slapd-*/db/* ar/lib/dirsrv/slapd-*/db/*/*"
+ dbfiles="var/lib/dirsrv/slapd-*/db/* var/lib/dirsrv/slapd-*/db/*/*
var/lib/dirsrv/slapd-*/cldb/*"
fi
libdir=usr/lib64/dirsrv
@@ -20,10 +20,11 @@ if [ ! -d /$libdir ] ; then
fi
# use new httpd.conf and admserv.conf
+cd /
tar cpjf $1 -C / --no-recursion --exclude httpd.conf --exclude admserv.conf \
etc/sysconfig/dirsrv* etc/dirsrv/slapd-* etc/dirsrv/slapd-*/* \
etc/dirsrv/slapd-*/schema/* var/run/dirsrv var/lock/dirsrv/slapd-* \
var/log/dirsrv/slapd-* var/lib/dirsrv/slapd-* var/lib/dirsrv/slapd-*/* \
var/lib/dirsrv/slapd-*/ldif/*.ldif $libdir/slapd-* $libdir/slapd-*/start-slapd \
- etc/dirsrv/admin-serv etc/dirsrv/admin-serv/* var/log/dirsrv/admin-serv $dbfiles
+ etc/dirsrv/admin-serv etc/dirsrv/admin-serv/* var/log/dirsrv/admin-serv `echo
$dbfiles`
ls -l $1
commit 0a659612a60fdb8e0474c36fb7a69e3669e21662
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Aug 9 15:37:31 2011 -0600
bump version to 1.1.22
diff --git a/VERSION.sh b/VERSION.sh
index d0c3ec4..491f3c5 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -11,7 +11,7 @@
vendorurl=http://port389.org
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=1
-VERSION_MAINT=21
+VERSION_MAINT=22
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit 8685e5764ff5fa3c4fb6115e60e3b56eabc0ddf6
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Aug 9 14:12:35 2011 -0600
add man pages for ds_removal and ds_unregister
add man pages for ds_removal and ds_unregister
Reviewed by: nkinder (Thanks!)
diff --git a/Makefile.am b/Makefile.am
index 999adc9..792f782 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,7 +246,9 @@ perl_DATA = admserv/newinst/src/ASDialogs.pm \
#------------------------
# man pages
#------------------------
-dist_man_MANS = man/man8/migrate-ds-admin.pl.8 \
+dist_man_MANS = man/man8/ds_removal.8 \
+ man/man8/ds_unregister.8 \
+ man/man8/migrate-ds-admin.pl.8 \
man/man8/setup-ds-admin.pl.8 \
man/man8/start-ds-admin.8 \
man/man8/stop-ds-admin.8 \
diff --git a/Makefile.in b/Makefile.in
index 3585ba0..da13e44 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -657,7 +657,9 @@ perl_DATA = admserv/newinst/src/ASDialogs.pm \
#------------------------
# man pages
#------------------------
-dist_man_MANS = man/man8/migrate-ds-admin.pl.8 \
+dist_man_MANS = man/man8/ds_removal.8 \
+ man/man8/ds_unregister.8 \
+ man/man8/migrate-ds-admin.pl.8 \
man/man8/setup-ds-admin.pl.8 \
man/man8/start-ds-admin.8 \
man/man8/stop-ds-admin.8 \
diff --git a/man/man8/ds_removal.8 b/man/man8/ds_removal.8
new file mode 100644
index 0000000..13824c4
--- /dev/null
+++ b/man/man8/ds_removal.8
@@ -0,0 +1,54 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH DS_REMOVAL 8 "Aug 9, 2011"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+ds_removal \- Remove a directory server instance and un-register it from the console
+.SH SYNOPSIS
+.B ds_removal
+[-f] -s \fIserver_id\fR -w \fIadmin_password\fR
+.SH DESCRIPTION
+Removes the specified Directory Server instance and un-registers it from
+the console. This will remove all files and directories associated with
+the directory server instance, so if you want to save any data or config,
+back it up first before running this command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+.SH OPTIONS
+A summary of options is included below:
+.TP
+.B \fB\-f\fR
+Optional \- Force removal \- ignore errors and remove everything
+.TP
+.B \fB\-s server_id\fR
+Required \- server_id \- the directory server identifier \- slapd\-\fIserver_id\fR
+.TP
+.B \fB\-w password\fR
+Required \- password \- the password for the console admin user
+.br
+.SH AUTHOR
+ds_removal was written by the 389 Project.
+.SH "REPORTING BUGS"
+Report bugs to
http://bugzilla.redhat.com.
+.SH COPYRIGHT
+Copyright \(co 2011 Red Hat, Inc.
+.br
+This is free software. You may redistribute copies of it under the terms of
+the Directory Server license found in the LICENSE file of this
+software distribution. This license is essentially the GNU General Public
+License version 2 with an exception for plug-in distribution.
diff --git a/man/man8/ds_unregister.8 b/man/man8/ds_unregister.8
new file mode 100644
index 0000000..bfe5f8b
--- /dev/null
+++ b/man/man8/ds_unregister.8
@@ -0,0 +1,48 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH DS_UNREGISTER 8 "Aug 9, 2011"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+ds_unregister \- Un-register a directory server instance from the console
+.SH SYNOPSIS
+.B ds_unregister
+-s \fIserver_id\fR -w \fIadmin_password\fR
+.SH DESCRIPTION
+Un-registers the specified directory server instance from the console.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+.SH OPTIONS
+A summary of options is included below:
+.TP
+.B \fB\-s server_id\fR
+Required \- server_id \- the directory server identifier \- slapd\-\fIserver_id\fR
+.TP
+.B \fB\-w password\fR
+Required \- password \- the password for the console admin user
+.br
+.SH AUTHOR
+ds_unregister was written by the 389 Project.
+.SH "REPORTING BUGS"
+Report bugs to
http://bugzilla.redhat.com.
+.SH COPYRIGHT
+Copyright \(co 2011 Red Hat, Inc.
+.br
+This is free software. You may redistribute copies of it under the terms of
+the Directory Server license found in the LICENSE file of this
+software distribution. This license is essentially the GNU General Public
+License version 2 with an exception for plug-in distribution.
commit 8edd72beeb624b5f03543297b1ec3d661a222550
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Aug 9 13:42:58 2011 -0600
handle binary upgrade
diff --git a/admserv/makeUpgradeTar.sh b/admserv/makeUpgradeTar.sh
index 6aaee21..51c5790 100755
--- a/admserv/makeUpgradeTar.sh
+++ b/admserv/makeUpgradeTar.sh
@@ -10,6 +10,10 @@ if [ -f "$1" ] ; then
exit 1
fi
+if [ -n "$2" ] ; then
+ dbfiles="var/lib/dirsrv/slapd-*/db/* ar/lib/dirsrv/slapd-*/db/*/*"
+fi
+
libdir=usr/lib64/dirsrv
if [ ! -d /$libdir ] ; then
libdir=usr/lib/dirsrv
@@ -21,5 +25,5 @@ tar cpjf $1 -C / --no-recursion --exclude httpd.conf --exclude
admserv.conf \
etc/dirsrv/slapd-*/schema/* var/run/dirsrv var/lock/dirsrv/slapd-* \
var/log/dirsrv/slapd-* var/lib/dirsrv/slapd-* var/lib/dirsrv/slapd-*/* \
var/lib/dirsrv/slapd-*/ldif/*.ldif $libdir/slapd-* $libdir/slapd-*/start-slapd \
- etc/dirsrv/admin-serv etc/dirsrv/admin-serv/* var/log/dirsrv/admin-serv
+ etc/dirsrv/admin-serv etc/dirsrv/admin-serv/* var/log/dirsrv/admin-serv $dbfiles
ls -l $1