[crypto-utils] update certwatch man page (#618421)
jorton
jorton at fedoraproject.org
Mon Jan 27 13:24:05 UTC 2014
commit 7e9f7dac60fafd2f9e0218edb61f5a49f6f2f276
Author: Joe Orton <jorton at redhat.com>
Date: Mon Jan 27 13:24:24 2014 +0000
update certwatch man page (#618421)
Resolves: rhbz#618421
certwatch.xml | 37 ++++++++++++++++++++++++++++++-------
crypto-utils.spec | 5 ++++-
2 files changed, 34 insertions(+), 8 deletions(-)
---
diff --git a/certwatch.xml b/certwatch.xml
index b97f2c3..d3a58e4 100644
--- a/certwatch.xml
+++ b/certwatch.xml
@@ -30,7 +30,7 @@
<cmdsynopsis>
<command>certwatch</command>
<arg choice="opt">OPTION...</arg>
- <arg choice="plain"><replaceable>filename</replaceable></arg>
+ <arg choice="plain"><replaceable>certname</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -41,8 +41,8 @@
warning mail when an SSL certificate is about to expire.</para>
<para>The program has two modes of operation: normal mode and
- quiet mode. In normal mode, the certificate given by the
- <replaceable>filename</replaceable> argument is examined, and a
+ quiet mode. In normal mode, the certificate identified by the
+ <replaceable>certname</replaceable> argument is examined, and a
warning email is issued to standard output if the certificate is
outside its validity period, or approaching expiry. If the
certificate cannot be found, or any errors occur whilst parsing
@@ -50,8 +50,13 @@
produced. In quiet mode, no output is given, but the exit status
can still be used.</para>
- <para>The certificate can be specified by its nickname or by a
- path to the containing file.</para>
+ <para>The certificate can be specified in one of two ways. If the
+ <option>--configdir</option> option is used, the
+ <replaceable>certname</replaceable> parameter is used as a
+ nickname to identify a certificate within an NSS database.
+ Otherwise, the <replaceable>certname</replaceable> parameter is
+ treated as a filename containing a certificate in OpenSSL "PEM"
+ format.</para>
</refsect1>
@@ -90,11 +95,29 @@
</varlistentry>
<varlistentry>
- <term><option>--directory <replaceable>cert-directory</replaceable></option>,
+ <term><option>--configdir <replaceable>cert-directory</replaceable></option>,
<option>-d <replaceable>cert-directory</replaceable></option></term>
<listitem><simpara>Specify the database directory containing the certificate
- and key database files. The default is yet to be determined.</simpara></listitem>
+ and key database files.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--certdbprefix <replaceable>prefix</replaceable></option>,
+ <option>-c <replaceable>prefix</replaceable></option></term>
+
+ <listitem><simpara>If <option>--configdir</option> is used,
+ specify the prefix used for the certificate database within
+ the database directory.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--keydbprefix <replaceable>prefix</replaceable></option>,
+ <option>-c <replaceable>prefix</replaceable></option></term>
+
+ <listitem><simpara>If <option>--configdir</option> is used,
+ specify the prefix used for the key database within the
+ database directory.</simpara></listitem>
</varlistentry>
</variablelist>
diff --git a/crypto-utils.spec b/crypto-utils.spec
index 3dc6b55..e964290 100644
--- a/crypto-utils.spec
+++ b/crypto-utils.spec
@@ -4,7 +4,7 @@
Summary: SSL certificate and key management utilities
Name: crypto-utils
Version: 2.4.1
-Release: 47%{?dist}
+Release: 48%{?dist}
Group: Applications/System
# certwatch.c is GPLv2
# pemutil.c etc are (MPLv1.1+ or GPLv2+ or LPGLv2+)
@@ -135,6 +135,9 @@ chmod -R u+w $RPM_BUILD_ROOT
%{perl_vendorarch}/auto/Crypt
%changelog
+* Mon Jan 27 2014 Joe Orton <jorton at redhat.com> - 2.4.1-48
+- update certwatch man page (#618421)
+
* Mon Jan 27 2014 Joe Orton <jorton at redhat.com> - 2.4.1-47
- genkey: escape passwords properly (#980859)
- genkey: escape commas in subject (#803305)
More information about the scm-commits
mailing list