You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/03/21 08:20:42 UTC
git commit: Update pupper modules
Repository: incubator-stratos
Updated Branches:
refs/heads/master a9a7419dc -> 1fdac0b5a
Update pupper modules
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1fdac0b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1fdac0b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1fdac0b5
Branch: refs/heads/master
Commit: 1fdac0b5a46b1611d6b02f79a8e2d3838b09cb3d
Parents: a9a7419
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Fri Mar 21 12:50:19 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Fri Mar 21 12:50:19 2014 +0530
----------------------------------------------------------------------
tools/puppet3/manifests/nodes.pp | 4 ++--
tools/puppet3/modules/tomcat/templates/server.xml.erb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1fdac0b5/tools/puppet3/manifests/nodes.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes.pp b/tools/puppet3/manifests/nodes.pp
index b73db8e..64ed5f6 100644
--- a/tools/puppet3/manifests/nodes.pp
+++ b/tools/puppet3/manifests/nodes.pp
@@ -39,8 +39,8 @@ node /lb/ inherits base {
# tomcat cartridge node
node /tomcat/ inherits base {
- $docroot = "/mnt/apache-tomcat-7.0.52/webapps/"
- $samlalias="/mnt/apache-tomcat-7.0.52/webapps/"
+ $docroot = "/mnt/apache-tomcat-${tomcat_version}/webapps/"
+ $samlalias="/mnt/apache-tomcat-${tomcat_version}/webapps/"
require java
class {'agent':}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1fdac0b5/tools/puppet3/modules/tomcat/templates/server.xml.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/tomcat/templates/server.xml.erb b/tools/puppet3/modules/tomcat/templates/server.xml.erb
index 5d7e9ed..a2c87d4 100644
--- a/tools/puppet3/modules/tomcat/templates/server.xml.erb
+++ b/tools/puppet3/modules/tomcat/templates/server.xml.erb
@@ -81,11 +81,11 @@
This connector uses the JSSE configuration, when using APR, the
connector should be using the OpenSSL style configuration
described in the APR documentation -->
- <!--
+
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
- -->
+
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />