From c7d4f6c8355d3e29c3d131e6964e98176579bd01 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Apr 07 2011 17:44:32 +0000
Subject: - add documentation for the CERTMONGER_CAS_DIR environment variable


---

diff --git a/configure.ac b/configure.ac
index dc7fe09..0fe9696 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,28 +58,29 @@ mylocalstatedir="$localstatedir/lib/${PACKAGE_NAME}")
 mylocalstatedir=`eval echo $mylocalstatedir | sed "s,NONE,$prefix,g"`
 mylocalstatedir=`eval echo $mylocalstatedir | sed "s,NONE,$ac_default_prefix,g"`
 mylocalstatedir=`eval echo $mylocalstatedir | sed "s,NONE,,g"`
-AC_DEFINE_UNQUOTED(CM_STORE_REQUESTS_DIRECTORY,"$mylocalstatedir/requests",
+
+CM_STORE_REQUESTS_DIRECTORY="$mylocalstatedir/requests"
+CM_STORE_REQUESTS_DIRECTORY_ENV="${UPCASE_PACKAGE_NAME}_REQUESTS_DIR"
+AC_SUBST(CM_STORE_REQUESTS_DIRECTORY)
+AC_SUBST(CM_STORE_REQUESTS_DIRECTORY_ENV)
+AC_DEFINE_UNQUOTED(CM_STORE_REQUESTS_DIRECTORY,"${CM_STORE_REQUESTS_DIRECTORY}",
 		   [Define to the default path for request tracking files.])
 AC_DEFINE_UNQUOTED(CM_STORE_SESSION_REQUESTS_DIRECTORY,".config/" PACKAGE_NAME "/requests",
 		   [Define to the default path for user request tracking files.])
-CM_STORE_REQUESTS_DIRECTORY="$mylocalstatedir/requests"
-AC_SUBST(CM_STORE_REQUESTS_DIRECTORY)
-AC_DEFINE_UNQUOTED(CM_STORE_REQUESTS_DIRECTORY_ENV,"${UPCASE_PACKAGE_NAME}_REQUESTS_DIR",
+AC_DEFINE_UNQUOTED(CM_STORE_REQUESTS_DIRECTORY_ENV,"${CM_STORE_REQUESTS_DIRECTORY_ENV}",
 		   [Define to the name of the environment variable which can specify the directory for tracking requests.])
-CM_STORE_REQUESTS_DIRECTORY_ENV="${UPCASE_PACKAGE_NAME}_REQUESTS_DIR"
-AC_SUBST(CM_STORE_REQUESTS_DIRECTORY_ENV)
-AC_DEFINE_UNQUOTED(CM_STORE_REQUEST_DEFAULTS,"$mylocalstatedir/defaults",
-		   [Define to the location of run-time defaults for requests.])
-UPCASE_PACKAGE_NAME=`echo "${PACKAGE_NAME}" | tr '[a-z]' '[A-Z]'`
-AC_DEFINE_UNQUOTED(CM_STORE_REQUEST_DEFAULTS_ENV,"${UPCASE_PACKAGE_NAME}_REQUEST_DEFAULTS_FILE",
-		   [Define to the name of the environment variable which can specify the path for the request defaults file.])
-AC_DEFINE_UNQUOTED(CM_STORE_CAS_DIRECTORY,"$mylocalstatedir/cas",
+
+CM_STORE_CAS_DIRECTORY="$mylocalstatedir/cas"
+CM_STORE_CAS_DIRECTORY_ENV="${UPCASE_PACKAGE_NAME}_CAS_DIR"
+AC_SUBST(CM_STORE_CAS_DIRECTORY)
+AC_SUBST(CM_STORE_CAS_DIRECTORY_ENV)
+AC_DEFINE_UNQUOTED(CM_STORE_CAS_DIRECTORY,"${CM_STORE_CAS_DIRECTORY}",
 		   [Define to the default path for CA tracking files.])
 AC_DEFINE_UNQUOTED(CM_STORE_SESSION_CAS_DIRECTORY,".config/" PACKAGE_NAME "/cas",
 		   [Define to the default path for user CA tracking files.])
-UPCASE_PACKAGE_NAME=`echo "${PACKAGE_NAME}" | tr '[a-z]' '[A-Z]'`
-AC_DEFINE_UNQUOTED(CM_STORE_CAS_DIRECTORY_ENV,"${UPCASE_PACKAGE_NAME}_CAS_DIR",
+AC_DEFINE_UNQUOTED(CM_STORE_CAS_DIRECTORY_ENV,"${CM_STORE_CAS_DIRECTORY_ENV}",
 		   [Define to the name of the environment variable which can specify the directory for tracking CAs.])
+
 mylocaledir="$localedir"
 mylocaledir=`eval echo $mylocaledir | sed "s,NONE,$prefix,g"`
 mylocaledir=`eval echo $mylocaledir | sed "s,NONE,$ac_default_prefix,g"`
diff --git a/src/certmonger.8.in b/src/certmonger.8.in
index cfe812b..8f03f4e 100644
--- a/src/certmonger.8.in
+++ b/src/certmonger.8.in
@@ -39,6 +39,9 @@ Store the daemon's process ID in the named file.
 The set of certificates being monitored or signed is tracked using files stored
 under \fI@CM_STORE_REQUESTS_DIRECTORY@\fR, or in a directory named by the
 \fI@CM_STORE_REQUESTS_DIRECTORY_ENV@\fR environment variable.
+The set of known CAs is tracked using files stored
+under \fI@CM_STORE_CAS_DIRECTORY@\fR, or in a directory named by the
+\fI@CM_STORE_CAS_DIRECTORY_ENV@\fR environment variable.
 
 .SH BUGS
 Please file tickets for any that you find at https://fedorahosted.org/certmonger/