cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [2/6] git commit: updated refs/heads/master to 45eb9fd
Date Sun, 31 Mar 2013 15:02:34 GMT
tomcat: Change some /etc/cloud paths to /etc/cloudstack

Signed-off-by: Wido den Hollander <wido@42on.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35e5b8e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35e5b8e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35e5b8e3

Branch: refs/heads/master
Commit: 35e5b8e3f818f23661450b175eb8c20ae2489938
Parents: 80da4d5
Author: Wido den Hollander <wido@42on.com>
Authored: Sun Mar 31 14:02:00 2013 +0200
Committer: Wido den Hollander <wido@42on.com>
Committed: Sun Mar 31 14:16:31 2013 +0200

----------------------------------------------------------------------
 client/tomcatconf/server-ssl.xml.in   |    4 ++--
 client/tomcatconf/tomcat6-ssl.conf.in |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35e5b8e3/client/tomcatconf/server-ssl.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/server-ssl.xml.in b/client/tomcatconf/server-ssl.xml.in
index 5d68f1d..37bc53d 100755
--- a/client/tomcatconf/server-ssl.xml.in
+++ b/client/tomcatconf/server-ssl.xml.in
@@ -94,7 +94,7 @@
                maxThreads="150" scheme="https" secure="true" URIEncoding="UTF-8"
                clientAuth="false" sslProtocol="TLS" 
                keystoreType="JKS"
-               keystoreFile="/etc/cloud/management/cloudmanagementserver.keystore"
+               keystoreFile="/etc/cloudstack/management/cloudmanagementserver.keystore"
                keystorePass="vmops.com"/>
 			   
     <!-- Define an AJP 1.3 Connector on port 20400 -->
@@ -200,7 +200,7 @@
                maxThreads="150" scheme="https" secure="true"
                clientAuth="false" sslProtocol="TLS" 
                keystoreType="JKS"
-               keystoreFile="/etc/cloud/management/cloudmanagementserver.keystore"
+               keystoreFile="/etc/cloudstack/management/cloudmanagementserver.keystore"
                keystorePass="vmops.com"/>
 			   
     <!-- Define an AJP 1.3 Connector on port 20400 -->

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35e5b8e3/client/tomcatconf/tomcat6-ssl.conf.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/tomcat6-ssl.conf.in b/client/tomcatconf/tomcat6-ssl.conf.in
index 84b6d62..0d26508 100644
--- a/client/tomcatconf/tomcat6-ssl.conf.in
+++ b/client/tomcatconf/tomcat6-ssl.conf.in
@@ -40,7 +40,7 @@ CATALINA_TMPDIR="@MSENVIRON@/temp"
 
 # Use JAVA_OPTS to set java.library.path for libtcnative.so
 #JAVA_OPTS="-Djava.library.path=/usr/lib64"
-JAVA_OPTS="-Djava.awt.headless=true -Djavax.net.ssl.trustStore=/etc/cloud/management/cloudmanagementserver.keystore
-Djavax.net.ssl.trustStorePassword=vmops.com -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@
-XX:MaxPermSize=800m -XX:PermSize=512M"
+JAVA_OPTS="-Djava.awt.headless=true -Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloudmanagementserver.keystore
-Djavax.net.ssl.trustStorePassword=vmops.com -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@
-XX:MaxPermSize=800m -XX:PermSize=512M"
 
 # What user should run tomcat
 TOMCAT_USER="@MSUSER@"


Mime
View raw message