From 86e6f99c4db10adc77f053bee9947d610d94c0d8 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: May 04 2010 18:28:00 +0000
Subject: - flesh out the default certmonger.conf so that people can get a

  feel for the expected formatting (Jenny Galipeau)
- tag 0.21

---

diff --git a/Makefile.am b/Makefile.am
index 8287433..18da9c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_FILES = doc/*.txt
 SUBDIRS = po src dbus tests
 EXTRA_DIST = config.rpath \
-	     certmonger.spec LICENSE README STATUS doc src/certmonger.conf
+	     certmonger.spec LICENSE README STATUS doc src/certmonger.conf.in
 
 VERSION=$(PACKAGE_VERSION)
 RELEASE=
diff --git a/STATUS b/STATUS
index 1d2c5af..a1f5cce 100644
--- a/STATUS
+++ b/STATUS
@@ -88,3 +88,6 @@ To-do:
     * If the CA cert includes a CRL distribution point extension, cache the
       CRL, too.  This'll require a new dependency on a retrieval library
       (probably libcurl) and a few changes to the internal state machine.
+  * Lighten build requirements by crafting and parsing XML-RPC ourselves
+    since we're already going to have to deal with non-XML-RPC XML and HTTP
+    when DogTag support goes in.
diff --git a/certmonger.spec b/certmonger.spec
index cffbdb4..6f392af 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -2,7 +2,7 @@
 %{?_with_check: %global pcheck 1}
 
 Name:		certmonger
-Version:	0.20
+Version:	0.21
 Release:	1%{?dist}
 Summary:	Certificate status monitor and PKI enrollment client
 
@@ -100,10 +100,13 @@ exit 0
 %{_localstatedir}/lib/certmonger
 
 %changelog
-* Thu Apr 22 2010 Nalin Dahyabhai <nalin@redhat.com>
+* Tue May  4 2010 Nalin Dahyabhai <nalin@redhat.com> 0.21-1
+- update to 0.21
   - getcert/*-getcert: relay the desired CA to the local service, whether
     specified on the command line (in getcert) or as a built-in hard-wired
     default (in *-getcert) (#584983)
+  - flesh out the default certmonger.conf so that people can get a feel for
+    the expected formatting (Jenny Galipeau)
 
 * Wed Apr 21 2010 Nalin Dahyabhai <nalin@redhat.com> 0.20-1
 - update to 0.20
diff --git a/configure.ac b/configure.ac
index abf161e..8d93b2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(certmonger,0.20)
+AC_INIT(certmonger,0.21)
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_MACRO_DIR(m4)
 AM_MAINTAINER_MODE
@@ -228,4 +228,4 @@ AC_DEFINE_UNQUOTED(CM_CERTMASTER_HELPER_PATH,"$mylibexecdir/certmaster-submit",[
 AM_CONDITIONAL(WITH_CERTMASTER,true)
 
 AC_CONFIG_COMMANDS(src_introspect_sh,[chmod +x src/introspect.sh])
-AC_OUTPUT(Makefile src/Makefile dbus/Makefile tests/Makefile tests/tools/Makefile dbus/certmonger.conf src/certmonger.init src/introspect.sh src/certmonger.8 src/getcert.1 src/getcert-request.1 src/getcert-list.1 src/getcert-list-cas.1 src/getcert-start-tracking.1 src/getcert-stop-tracking.1 src/selfsign-getcert.1 src/ipa-getcert.1 src/getcert-resubmit.1 src/certmonger-certmaster-submit.8 src/certmonger-ipa-submit.8 src/certmaster-getcert.1 src/certmonger.conf.5 po/Makefile.in)
+AC_OUTPUT(Makefile src/Makefile dbus/Makefile tests/Makefile tests/tools/Makefile dbus/certmonger.conf src/certmonger.init src/introspect.sh src/certmonger.8 src/getcert.1 src/getcert-request.1 src/getcert-list.1 src/getcert-list-cas.1 src/getcert-start-tracking.1 src/getcert-stop-tracking.1 src/selfsign-getcert.1 src/ipa-getcert.1 src/getcert-resubmit.1 src/certmonger-certmaster-submit.8 src/certmonger-ipa-submit.8 src/certmaster-getcert.1 src/certmonger.conf.5 po/Makefile.in src/certmonger.conf)
diff --git a/src/certmonger.conf b/src/certmonger.conf
deleted file mode 100644
index a770037..0000000
--- a/src/certmonger.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[defaults]
-
-[selfsign]
diff --git a/src/certmonger.conf.in b/src/certmonger.conf.in
new file mode 100644
index 0000000..fec89a6
--- /dev/null
+++ b/src/certmonger.conf.in
@@ -0,0 +1,17 @@
+# This is the certmonger configuration file.  The format is a rather basic
+# INI-style file.  See certmonger.conf(5) for notes about individual settings.
+# · initial whitespace is ignored
+# · whitespace between the key name and "=" is ignored
+# · whitespace after "=" is ignored
+# · trailing whitespace after values is ignored
+# · comments begin with "#"
+# · keys and section names are case-sensitive
+# · there is no end-of-line continuation
+#
+# [defaults]
+# notification_method = syslog
+# notification_destination = @CM_DEFAULT_NOTIFICATION_SYSLOG_PRIORITY@
+#
+# [selfsign]
+# validity_period = @CM_DEFAULT_CERT_LIFETIME@
+#