blob: a546656b66ca1c140d35bf326d839204856fea4e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Index: base/ca/shared/conf/tomcat6.conf
===================================================================
--- base/ca/shared/conf/tomcat6.conf (revision 2117)
+++ base/ca/shared/conf/tomcat6.conf (revision 2118)
@@ -47,6 +47,9 @@
# Set the TOMCAT_PID location
CATALINA_PID="[TOMCAT_PIDFILE]"
+# Set the tomcat log file
+TOMCAT_LOG="[TOMCAT_LOG_DIR]/catalina.out"
+
# Connector port is 8080 for this tomcat6 instance
#CONNECTOR_PORT="8080"
Index: base/setup/pkicreate
===================================================================
--- base/setup/pkicreate (revision 2117)
+++ base/setup/pkicreate (revision 2118)
@@ -305,6 +305,7 @@
my $TOMCAT_SSL3_CIPHERS = "TOMCAT_SSL3_CIPHERS";
my $TOMCAT_TLS3_CIPHERS = "TOMCAT_TLS3_CIPHERS";
my $TOMCAT_INSTANCE_COMMON_LIB = "TOMCAT_INSTANCE_COMMON_LIB";
+my $TOMCAT_LOG_DIR = "TOMCAT_LOG_DIR";
my $PKI_INSTANCE_INITSCRIPT = "PKI_INSTANCE_INITSCRIPT";
my $PKI_FLAVOR_SLOT = "PKI_FLAVOR";
my $PKI_UNSECURE_PORT_CONNECTOR_NAME_SLOT = "PKI_UNSECURE_PORT_CONNECTOR_NAME";
@@ -2419,6 +2420,13 @@
. "-SSL3_RSA_WITH_NULL_MD5,-TLS_RSA_EXPORT1024_WITH_RC4_56_SHA,"
. "-TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,+TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA";
$slot_hash{$TOMCAT_INSTANCE_COMMON_LIB} = "$tomcat_instance_common_lib_path/*.jar";
+ if (!$redirected_logs_path) {
+ $slot_hash{$TOMCAT_LOG_DIR} = $logs_instance_path;
+ }
+ else {
+ $slot_hash{$TOMCAT_LOG_DIR} = $redirected_logs_path;
+ }
+
}
## Process templates (instance independent)
|
