You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/03/27 11:00:19 UTC
[2/2] git commit: updated refs/heads/master to e2fe8e6
CLOUDSTACK-8351: Cloudstack https configuration wrong in server.xml
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e2fe8e64
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e2fe8e64
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e2fe8e64
Branch: refs/heads/master
Commit: e2fe8e649919796545bdd825b18fc8b2c0c1da4b
Parents: 5f59091
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Mar 27 15:10:54 2015 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Fri Mar 27 15:29:17 2015 +0530
----------------------------------------------------------------------
client/tomcatconf/server-nonssl.xml.in | 4 ++--
client/tomcatconf/server-ssl.xml.in | 4 ++--
client/tomcatconf/server7-nonssl.xml.in | 4 ++--
client/tomcatconf/server7-ssl.xml.in | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2fe8e64/client/tomcatconf/server-nonssl.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/server-nonssl.xml.in b/client/tomcatconf/server-nonssl.xml.in
index e0debe4..01086fd 100755
--- a/client/tomcatconf/server-nonssl.xml.in
+++ b/client/tomcatconf/server-nonssl.xml.in
@@ -84,7 +84,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" sslEnabledProtocols="TLSv1.2,TLSv1.1"
keystoreType="PKCS12"
- keystoreFile="conf\cloud-localhost.pk12"
+ keystoreFile="conf/cloud-localhost.pk12"
keystorePass="password"
/>
-->
@@ -169,7 +169,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS"
keystoreType="PKCS12"
- keystoreFile="conf\cloud-localhost.pk12"
+ keystoreFile="conf/cloud-localhost.pk12"
keystorePass="password"
/>
-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2fe8e64/client/tomcatconf/server-ssl.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/server-ssl.xml.in b/client/tomcatconf/server-ssl.xml.in
index 2e61251..729bf1a 100755
--- a/client/tomcatconf/server-ssl.xml.in
+++ b/client/tomcatconf/server-ssl.xml.in
@@ -84,7 +84,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" sslEnabledProtocols="TLSv1.2,TLSv1.1"
keystoreType="PKCS12"
- keystoreFile="conf\cloud-localhost.pk12"
+ keystoreFile="conf/cloud-localhost.pk12"
keystorePass="password"
/>
-->
@@ -190,7 +190,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS"
keystoreType="PKCS12"
- keystoreFile="conf\cloud-localhost.pk12"
+ keystoreFile="conf/cloud-localhost.pk12"
keystorePass="password"
/>
-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2fe8e64/client/tomcatconf/server7-nonssl.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/server7-nonssl.xml.in b/client/tomcatconf/server7-nonssl.xml.in
index 7ea251a..d59f829 100755
--- a/client/tomcatconf/server7-nonssl.xml.in
+++ b/client/tomcatconf/server7-nonssl.xml.in
@@ -84,7 +84,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" sslEnabledProtocols="TLSv1.2,TLSv1.1"
keystoreType="PKCS12"
- keystoreFile="conf\cloud-localhost.pk12"
+ keystoreFile="conf/cloud-localhost.pk12"
keystorePass="password"
/>
-->
@@ -169,7 +169,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS"
keystoreType="PKCS12"
- keystoreFile="conf\cloud-localhost.pk12"
+ keystoreFile="conf/cloud-localhost.pk12"
keystorePass="password"
/>
-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2fe8e64/client/tomcatconf/server7-ssl.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/server7-ssl.xml.in b/client/tomcatconf/server7-ssl.xml.in
index 97421ba..2c30651 100755
--- a/client/tomcatconf/server7-ssl.xml.in
+++ b/client/tomcatconf/server7-ssl.xml.in
@@ -84,7 +84,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" sslEnabledProtocols="TLSv1.2,TLSv1.1"
keystoreType="PKCS12"
- keystoreFile="conf\cloud-localhost.pk12"
+ keystoreFile="conf/cloud-localhost.pk12"
keystorePass="password"
/>
-->
@@ -190,7 +190,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS"
keystoreType="PKCS12"
- keystoreFile="conf\cloud-localhost.pk12"
+ keystoreFile="conf/cloud-localhost.pk12"
keystorePass="password"
/>
-->