diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-04-07 16:42:58 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-04-07 16:45:13 +0200 |
| commit | 10d8f53c25d8ed7907b55c247fc77e5c3900029b (patch) | |
| tree | d8f68893d2d40e141e4577b1c25b96099e4434d1 /base/console | |
| parent | 000695e0e116f2325cb3d92b056d5148a58553b4 (diff) | |
| download | pki-10d8f53c25d8ed7907b55c247fc77e5c3900029b.tar.gz pki-10d8f53c25d8ed7907b55c247fc77e5c3900029b.tar.xz pki-10d8f53c25d8ed7907b55c247fc77e5c3900029b.zip | |
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
Diffstat (limited to 'base/console')
| -rwxr-xr-x | base/console/templates/pki_console_wrapper | 16 |
1 files changed, 13 insertions, 3 deletions
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 |