From 10d8f53c25d8ed7907b55c247fc77e5c3900029b Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 7 Apr 2017 16:42:58 +0200
Subject: Fixed pki_console_wrapper.

The pki_console_wrapper script has been fixed to load cascading
pki.conf properly and to set the logging configuration property.

Change-Id: Ie7b83f3c87bea133ee61d018457d7d4daf0fb757
---
 base/console/templates/pki_console_wrapper | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'base/console')

diff --git a/base/console/templates/pki_console_wrapper b/base/console/templates/pki_console_wrapper
index 3e3c16926..3ee90bd30 100755
--- a/base/console/templates/pki_console_wrapper
+++ b/base/console/templates/pki_console_wrapper
@@ -19,11 +19,20 @@
 # --- END COPYRIGHT BLOCK ---
 #
 
-# Read default PKI configuration.
+# default PKI configuration
 . /usr/share/pki/etc/pki.conf
 
-# Read user-defined PKI configuration.
-. /etc/pki/pki.conf
+# system-wide PKI configuration
+if [ -f /etc/pki/pki.conf ]
+then
+    . /etc/pki/pki.conf
+fi
+
+# user-specific PKI configuration
+if [ -f $HOME/.dogtag/pki.conf ]
+then
+    . $HOME/.dogtag/pki.conf
+fi
 
 # Check to insure that this script's original invocation directory
 # has not been deleted!
@@ -151,6 +160,7 @@ ${JAVA} ${JAVA_OPTIONS} \
   -cp ${CP} \
   -Djava.util.prefs.systemRoot=/tmp/.java \
   -Djava.util.prefs.userRoot=/tmp/java \
+  -Djava.util.logging.config.file=${LOGGING_CONFIG} \
   com.netscape.admin.certsrv.Console \
   -s instanceID \
   -a $1
-- 
cgit