Skip to content
This repository has been archived by the owner on Jan 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #91 from linc01n/3_16_0
Browse files Browse the repository at this point in the history
Prepare for 3.16.0 cookbook release
  • Loading branch information
linc01n committed Jun 19, 2015
2 parents d3996fd + 36f10b0 commit b17ee5c
Show file tree
Hide file tree
Showing 8 changed files with 521 additions and 8 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@
* Enhancement: [#58][]: Update mysql dependency to ~> 6.0
* Enhancement: [#61][]: Fix deprecation warning from Berkshelf

## 3.16.0

### 3.16.0 Major Changes

* In default recipe run `stash::configuration` before `stash::tomcat_configuration`
* For stash version 3.8+, move `server.xml` from `#{install_path}/config` to `#{home_path}/shared`
* Increase default `maximum_permgen` from `256m` to `384m` [#84][]

### 3.16.0 Minor Changes

* Enhancement: [#87][]: Add support of Stash versions 3.8.1, 3.9.1, 3.9.2, 3.10.0
* Bugfix: [#89][]: Use proper setenv.sh format for v3.8+
* Bugfix: [#90][]: Do a apt-get update before running package install for debian-based vagrant


## 3.15.0

* Enhancement: [#82][]: Default to Stash 3.8.0 and Stash Backup Client 1.8.2
Expand Down Expand Up @@ -482,3 +497,7 @@ To switch to new defaults:
[#77]: https://github.com/bflad/chef-stash/issues/77
[#79]: https://github.com/bflad/chef-stash/issues/79
[#82]: https://github.com/bflad/chef-stash/issues/82
[#84]: https://github.com/bflad/chef-stash/issues/84
[#87]: https://github.com/bflad/chef-stash/issues/87
[#89]: https://github.com/bflad/chef-stash/issues/89
[#90]: https://github.com/bflad/chef-stash/issues/90
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Attribute | Description | Type | Default
----------|-------------|------|--------
minimum_memory | JVM minimum memory | String | 512m
maximum_memory | JVM maximum memory | String | 768m
maximum_permgen | JVM maximum PermGen memory | String | 256m
maximum_permgen | JVM maximum PermGen memory | String | 384m
java_opts | additional JAVA_OPTS to be passed to Stash JVM during startup | String | ""
support_args | additional JAVA_OPTS recommended by Atlassian support for Stash JVM during startup | String | ""

Expand Down Expand Up @@ -298,4 +298,6 @@ Please see license information in: [LICENSE](LICENSE)
* Ramon Makkelie (@ramonskie)
* Martin (@martianus)
* Mikhail Zholobov (@legal90)
* Claudio Rivabene (@crivabene)
* Patrick Connolly (@patcon)
* Lincoln Lee (@linc01n)
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@

default['stash']['jvm']['minimum_memory'] = '512m'
default['stash']['jvm']['maximum_memory'] = '768m'
default['stash']['jvm']['maximum_permgen'] = '256m'
default['stash']['jvm']['maximum_permgen'] = '384m'
default['stash']['jvm']['java_opts'] = ''
default['stash']['jvm']['support_args'] = ''

Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache 2.0'
description 'Installs/Configures Atlassian Stash'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '3.15.0'
version '3.16.0'
recipe 'stash', 'Installs/Configures Atlassian Stash'
recipe 'stash::apache2', 'Installs/Configures Apache 2 proxy for Stash'
recipe 'stash::backup_client', 'Installs/Configures Atlassian Stash Backup Client'
Expand Down
2 changes: 1 addition & 1 deletion recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

include_recipe 'stash::database' if settings['database']['host'] == 'localhost'
include_recipe "stash::#{platform}_#{node['stash']['install_type']}"
include_recipe 'stash::configuration'
include_recipe 'stash::tomcat_configuration'
include_recipe 'stash::apache2'
include_recipe 'stash::configuration'
include_recipe "stash::service_#{node['stash']['service_type']}"
include_recipe 'stash::backup_client' if node['stash']['backup_client']['version']
19 changes: 15 additions & 4 deletions recipes/tomcat_configuration.rb
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
settings = Stash.settings(node)
stash_version = Chef::Version.new(node['stash']['version'])
server_xml_path = "#{node['stash']['install_path']}/stash/conf/server.xml"

if stash_version >= Chef::Version.new('3.8.0')
server_xml_path = "#{node['stash']['home_path']}/shared/server.xml"
end

template "#{node['stash']['install_path']}/stash/bin/setenv.sh" do
source 'setenv.sh.erb'
if stash_version < Chef::Version.new('3.8.0')
source 'setenv.sh.erb'
else
source '3.8+/setenv.sh.erb'
end
owner node['stash']['user']
mode '0755'
notifies :restart, 'service[stash]', :delayed
end

template "#{node['stash']['install_path']}/stash/conf/server.xml" do
template server_xml_path do
if stash_version.major == 1
source 'server.xml.erb'
elsif stash_version >= Chef::Version.new('3.3.0')
elsif stash_version < Chef::Version.new('3.3.0')
source 'server-tomcat7.xml.erb'
elsif stash_version < Chef::Version.new('3.8.0')
source 'server-tomcat8.xml.erb'
else
source 'server-tomcat7.xml.erb'
source '3.8+/server.xml.erb'
end
owner node['stash']['user']
mode '0640'
Expand Down
185 changes: 185 additions & 0 deletions templates/default/3.8+/server.xml.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
Dynamically generated by Chef on <%= node["fqdn"] %>
Local modifications will be overwritten by Chef.
-->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Note: A "Server" is not itself a "Container", so you may not
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
-->
<Server port="8006" shutdown="SHUTDOWN">
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<!--Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /-->

<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
-->
<GlobalNamingResources>
<!-- Editable user database that can also be used by
UserDatabaseRealm to authenticate users
-->
<Resource name="UserDatabase" auth="Container"
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
pathname="conf/tomcat-users.xml" />
</GlobalNamingResources>

<!-- A "Service" is a collection of one or more "Connectors" that share
a single "Container" Note: A "Service" is not itself a "Container",
so you may not define subcomponents such as "Valves" at this level.
Documentation at /docs/config/service.html
-->
<Service name="Catalina">

<!--The connectors can use a shared executor, you can define one or more named thread pools-->
<!--
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
maxThreads="150" minSpareThreads="4"/>
-->


<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
Java AJP Connector: /docs/config/ajp.html
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 7990
If you change this port, you have to update scripts.cfg as well
to have the same port configuration.
-->
<Connector port="<%= node['stash']['tomcat']['port'] %>" protocol="HTTP/1.1"
connectionTimeout="20000"
useBodyEncodingForURI="true"
compression="on"
compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript"
<% if node['stash']['apache2'] -%>
redirectPort="<%= node['stash']['apache2']['ssl']['port'] %>"
secure="true"
scheme="https"
proxyName="<%= node['stash']['apache2']['virtual_host_alias'] %>"
proxyPort="<%= node['stash']['apache2']['ssl']['port'] %>"
<% else -%>
redirectPort="<%= node['stash']['tomcat']['ssl_port'] %>"
<% end -%>
/>

<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="7990" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation that requires the JSSE
style configuration. When using the APR/native implementation, the
OpenSSL style configuration is required as described in the APR/native
documentation -->
<Connector port="<%= node['stash']['tomcat']['ssl_port'] %>"
maxHttpHeaderSize="8192"
SSLEnabled="true"
maxThreads="150"
minSpareThreads="25"
maxSpareThreads="75"
enableLookups="false"
disableUploadTimeout="true"
useBodyEncodingForURI="true"
acceptCount="100"
scheme="https"
secure="true"
clientAuth="false"
sslProtocol="TLS"
<%- if @tomcat %>
<%= "keyAlias=\"#{@tomcat['keyAlias']}\"" if @tomcat['keyAlias'] %>
<%= "keystoreFile=\"#{@tomcat['keystoreFile']}\"" if @tomcat['keystoreFile'] %>
<%= "keystorePass=\"#{@tomcat['keystorePass']}\"" if @tomcat['keystorePass'] %>
<%- end %>
/>

<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host).
Documentation at /docs/config/engine.html -->

<!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
<Engine name="Catalina" defaultHost="localhost">

<!-- For clustering, please take a look at documentation at:
/docs/cluster-howto.html (simple how to)
/docs/config/cluster.html (reference documentation) -->
<!--
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-->

<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
<Realm className="org.apache.catalina.realm.LockOutRealm">
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
</Realm>

<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true"
xmlValidation="false" xmlNamespaceAware="false">

<!-- Before changing the context path for Stash, please read our documentation:
https://confluence.atlassian.com/x/5oCNEQ
You will have to update scripts.cfg
AND rename webapps/ROOT directory. -->

<Context docBase="${catalina.home}/atlassian-stash"
path=""
reloadable="false"
useHttpOnly="true"/>

<!-- SingleSignOn valve, share authentication between web applications
Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-->

<!-- Access log processes all example.
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
<!--
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access_log" suffix=".txt"
pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-->
</Host>
</Engine>
</Service>
</Server>
Loading

0 comments on commit b17ee5c

Please sign in to comment.