Skip to content
This repository was archived by the owner on Oct 21, 2020. It is now read-only.

Commit

Permalink
Merge pull request #162 from Alfresco/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
Enzo Rivello authored Nov 14, 2016
2 parents 29e7b54 + e4e2463 commit 3425685
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 55 deletions.
114 changes: 62 additions & 52 deletions recipes/_tomcat-attributes.rb
View file
Original file line number Diff line number Diff line change
@@ -1,120 +1,130 @@
# Using catalina-jmx
node.default['artifacts']['catalina-jmx']['groupId'] = "org.apache.tomcat"
node.default['artifacts']['catalina-jmx']['artifactId'] = "tomcat-catalina-jmx-remote"
node.default['artifacts']['catalina-jmx']['version'] = "7.0.54"
node.default['artifacts']['catalina-jmx']['groupId'] = 'org.apache.tomcat'
node.default['artifacts']['catalina-jmx']['artifactId'] = 'tomcat-catalina-jmx-remote'
node.default['artifacts']['catalina-jmx']['version'] = '7.0.54'
node.default['artifacts']['catalina-jmx']['type'] = 'jar'
node.default['artifacts']['catalina-jmx']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['catalina-jmx']['owner'] = node['alfresco']['user']



node.default['artifacts']['memcached-session-manager']['groupId'] = "de.javakaffee.msm"
node.default['artifacts']['memcached-session-manager']['artifactId'] = "memcached-session-manager"
node.default['artifacts']['memcached-session-manager']['version'] = "1.9.2"
node.default['artifacts']['memcached-session-manager']['groupId'] = 'de.javakaffee.msm'
node.default['artifacts']['memcached-session-manager']['artifactId'] = 'memcached-session-manager'
node.default['artifacts']['memcached-session-manager']['version'] = '1.9.3'
node.default['artifacts']['memcached-session-manager']['type'] = 'jar'
node.default['artifacts']['memcached-session-manager']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['memcached-session-manager']['owner'] = node['alfresco']['user']

node.default['artifacts']['memcached-session-manager-tc7']['groupId'] = "de.javakaffee.msm"
node.default['artifacts']['memcached-session-manager-tc7']['artifactId'] = "memcached-session-manager-tc7"
node.default['artifacts']['memcached-session-manager-tc7']['version'] = "1.9.2"
node.default['artifacts']['memcached-session-manager-tc7']['groupId'] = 'de.javakaffee.msm'
node.default['artifacts']['memcached-session-manager-tc7']['artifactId'] = 'memcached-session-manager-tc7'
node.default['artifacts']['memcached-session-manager-tc7']['version'] = '1.9.3'
node.default['artifacts']['memcached-session-manager-tc7']['type'] = 'jar'
node.default['artifacts']['memcached-session-manager-tc7']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['memcached-session-manager-tc7']['owner'] = node['alfresco']['user']

node.default['artifacts']['spymemcached']['groupId'] = "net.spy"
node.default['artifacts']['spymemcached']['artifactId'] = "spymemcached"
node.default['artifacts']['spymemcached']['version'] = "2.11.1"
node.default['artifacts']['spymemcached']['groupId'] = 'net.spy'
node.default['artifacts']['spymemcached']['artifactId'] = 'spymemcached'
node.default['artifacts']['spymemcached']['version'] = '2.11.1'
node.default['artifacts']['spymemcached']['type'] = 'jar'
node.default['artifacts']['spymemcached']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['spymemcached']['owner'] = node['alfresco']['user']

node.default['artifacts']['msm-kryo-serializer']['groupId'] = "de.javakaffee.msm"
node.default['artifacts']['msm-kryo-serializer']['artifactId'] = "msm-kryo-serializer"
node.default['artifacts']['msm-kryo-serializer']['version'] = "1.9.2"
node.default['artifacts']['msm-kryo-serializer']['groupId'] = 'de.javakaffee.msm'
node.default['artifacts']['msm-kryo-serializer']['artifactId'] = 'msm-kryo-serializer'
node.default['artifacts']['msm-kryo-serializer']['version'] = '1.9.3'
node.default['artifacts']['msm-kryo-serializer']['type'] = 'jar'
node.default['artifacts']['msm-kryo-serializer']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['msm-kryo-serializer']['owner'] = node['alfresco']['user']

node.default['artifacts']['kryo-serializers']['groupId'] = "de.javakaffee"
node.default['artifacts']['kryo-serializers']['artifactId'] = "kryo-serializers"
node.default['artifacts']['kryo-serializers']['version'] = "0.34"
node.default['artifacts']['kryo-serializers']['groupId'] = 'de.javakaffee'
node.default['artifacts']['kryo-serializers']['artifactId'] = 'kryo-serializers'
node.default['artifacts']['kryo-serializers']['version'] = '0.34'
node.default['artifacts']['kryo-serializers']['type'] = 'jar'
node.default['artifacts']['kryo-serializers']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['kryo-serializers']['owner'] = node['alfresco']['user']

node.default['artifacts']['kryo']['groupId'] = "com.esotericsoftware"
node.default['artifacts']['kryo']['artifactId'] = "kryo"
node.default['artifacts']['kryo']['version'] = "3.0.3"
node.default['artifacts']['kryo']['groupId'] = 'com.esotericsoftware'
node.default['artifacts']['kryo']['artifactId'] = 'kryo'
node.default['artifacts']['kryo']['version'] = '3.0.3'
node.default['artifacts']['kryo']['type'] = 'jar'
node.default['artifacts']['kryo']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['kryo']['owner'] = node['alfresco']['user']

node.default['artifacts']['minlog']['groupId'] = "com.esotericsoftware"
node.default['artifacts']['minlog']['artifactId'] = "minlog"
node.default['artifacts']['minlog']['version'] = "1.3.0"
node.default['artifacts']['minlog']['groupId'] = 'com.esotericsoftware'
node.default['artifacts']['minlog']['artifactId'] = 'minlog'
node.default['artifacts']['minlog']['version'] = '1.3.0'
node.default['artifacts']['minlog']['type'] = 'jar'
node.default['artifacts']['minlog']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['minlog']['owner'] = node['alfresco']['user']

node.default['artifacts']['reflectasm']['groupId'] = "com.esotericsoftware"
node.default['artifacts']['reflectasm']['artifactId'] = "reflectasm"
node.default['artifacts']['reflectasm']['version'] = "1.11.3"
node.default['artifacts']['reflectasm']['groupId'] = 'com.esotericsoftware'
node.default['artifacts']['reflectasm']['artifactId'] = 'reflectasm'
node.default['artifacts']['reflectasm']['version'] = '1.11.3'
node.default['artifacts']['reflectasm']['type'] = 'jar'
node.default['artifacts']['reflectasm']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['reflectasm']['owner'] = node['alfresco']['user']

node.default['artifacts']['asm']['groupId'] = "org.ow2.asm"
node.default['artifacts']['asm']['artifactId'] = "asm"
node.default['artifacts']['asm']['version'] = "5.1"
node.default['artifacts']['asm']['groupId'] = 'org.ow2.asm'
node.default['artifacts']['asm']['artifactId'] = 'asm'
node.default['artifacts']['asm']['version'] = '5.1'
node.default['artifacts']['asm']['type'] = 'jar'
node.default['artifacts']['asm']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['asm']['owner'] = node['alfresco']['user']

node.default['artifacts']['objenesis']['groupId'] = 'org.objenesis'
node.default['artifacts']['objenesis']['artifactId'] = 'objenesis'
node.default['artifacts']['objenesis']['version'] = '2.4'
node.default['artifacts']['objenesis']['type'] = 'jar'
node.default['artifacts']['objenesis']['destination'] = "#{node['alfresco']['home']}/lib"
node.default['artifacts']['objenesis']['owner'] = node['alfresco']['user']

# attributes for share.xml.erb
node.default['tomcat']['memcached']['sticky'] = true
node.default['tomcat']['memcached']['sessionBackupAsync'] = true
node.default['tomcat']['memcached']['copyCollectionsForSerialization'] = false

node.default['tomcat']['jvm_route'] = node['alfresco']['public_hostname']

node.default['tomcat']['global_templates'] = [{
"dest" => "#{node['alfresco']['home']}/conf",
"filename" => "jmxremote.access",
"owner" => "tomcat"
},{
"dest" => "#{node['alfresco']['home']}/conf",
"filename" => "jmxremote.password",
"owner" => "tomcat"
},{
"dest" => "#{node['alfresco']['home']}-alfresco/lib/org/apache/catalina/util",
"filename" => "ServerInfo.properties",
"owner" => "tomcat"
},{
"dest" => "/etc/security/limits.d",
"filename" => "tomcat_limits.conf",
"owner" => "tomcat"
'dest' => "#{node['alfresco']['home']}/conf",
'filename' => 'jmxremote.access',
'owner' => 'tomcat'
}, {
'dest' => "#{node['alfresco']['home']}/conf",
'filename' => 'jmxremote.password',
'owner' => 'tomcat'
}, {
'dest' => "#{node['alfresco']['home']}-alfresco/lib/org/apache/catalina/util",
'filename' => 'ServerInfo.properties',
'owner' => 'tomcat'
}, {
'dest' => '/etc/security/limits.d',
'filename' => 'tomcat_limits.conf',
'owner' => 'tomcat'
}]

# Setting JAVA_OPTS
alfresco_components = node['alfresco']['components']
if node['tomcat']['run_base_instance']
node.default['alfresco']['restart_services'] = ['tomcat']
if alfresco_components.include? 'solr'
node.default["tomcat"]["java_options"]['rmi_and_solr'] = "-Dalfresco.home=#{node['alfresco']['home']} -Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']} -Dsolr.solr.home=#{node['alfresco']['solr']['home']} -Dsolr.solr.model.dir=#{node['alfresco']['solr']['alfresco_models']} -Dsolr.solr.content.dir=#{node['alfresco']['solr']['contentstore.path']}"
node.default['tomcat']['java_options']['rmi_and_solr'] = "-Dalfresco.home=#{node['alfresco']['home']} -Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']} -Dsolr.solr.home=#{node['alfresco']['solr']['home']} -Dsolr.solr.model.dir=#{node['alfresco']['solr']['alfresco_models']} -Dsolr.solr.content.dir=#{node['alfresco']['solr']['contentstore.path']}"
end
else
if alfresco_components.include? "repo"
node.default["alfresco"]["repo_tomcat_instance"]['java_options']['rmi_and_alfhome'] = "-Dalfresco.home=#{node['alfresco']['home']}-alfresco -Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']}"
if alfresco_components.include? 'repo'
node.default['alfresco']['repo_tomcat_instance']['java_options']['rmi_and_alfhome'] = "-Dalfresco.home=#{node['alfresco']['home']}-alfresco -Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']}"
if alfresco_components.include? 'yourkit'
node.default['alfresco']['repo_tomcat_instance']['java_options']['yourkit'] = "-agentpath:/usr/local/lib64/libyjpagent.so=dir=#{node['tomcat']['cache_root_folder']}/tomcat-alfresco,telemetrylimit=1,builtinprobes=none,onexit=snapshot,sessionname=repo,tmpdir=/usr/share/tomcat-alfresco/temp"
end
node.default['tomcat']['instances']['alfresco'] = node['alfresco']['repo_tomcat_instance']
end
if alfresco_components.include? 'share'
node.default["alfresco"]["share_tomcat_instance"]['java_options']['rmi'] = "-Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']}"
node.default['alfresco']['share_tomcat_instance']['java_options']['rmi'] = "-Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']}"
if alfresco_components.include? 'yourkit'
node.default['alfresco']['share_tomcat_instance']['java_options']['yourkit'] = "-agentpath:/usr/local/lib64/libyjpagent.so=dir=#{node['tomcat']['cache_root_folder']}/tomcat-share,telemetrylimit=1,builtinprobes=none,onexit=snapshot,sessionname=share,tmpdir=/usr/share/tomcat-share/temp,disableall"
end
node.default['tomcat']['instances']['share'] = node['alfresco']['share_tomcat_instance']
end
if alfresco_components.include? 'solr'
node.default["alfresco"]["solr_tomcat_instance"]['java_options']['rmi_and_solr'] = "-Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']} -Dsolr.solr.model.dir=#{node['alfresco']['solr']['alfresco_models']} -Dsolr.solr.home=#{node['alfresco']['solr']['home']} -Dsolr.solr.content.dir=#{node['alfresco']['solr']['contentstore.path']}"
node.default['alfresco']['solr_tomcat_instance']['java_options']['rmi_and_solr'] = "-Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']} -Dsolr.solr.model.dir=#{node['alfresco']['solr']['alfresco_models']} -Dsolr.solr.home=#{node['alfresco']['solr']['home']} -Dsolr.solr.content.dir=#{node['alfresco']['solr']['contentstore.path']}"
if alfresco_components.include? 'yourkit'
node.default['alfresco']['solr_tomcat_instance']['java_options']['yourkit'] = "-agentpath:/usr/local/lib64/libyjpagent.so=dir=#{node['tomcat']['cache_root_folder']}/tomcat-solr,telemetrylimit=1,builtinprobes=none,onexit=snapshot,sessionname=solr,tmpdir=/usr/share/tomcat-solr/temp"
end
Expand Down
9 changes: 6 additions & 3 deletions templates/default/tomcat/share.xml.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@

<Manager className="de.javakaffee.web.msm.MemcachedBackupSessionManager"
memcachedNodes="<%= node['tomcat']['memcached_nodes'] %>"
requestUriIgnorePattern=".*\.(ico|png|gif|jpg|css|js)$"
transcoderFactoryClass="de.javakaffee.web.msm.serializer.kryo.KryoTranscoderFactory"
/>
requestUriIgnorePattern=".*\.(ico|png|gif|jpg|css|js)$"
transcoderFactoryClass="de.javakaffee.web.msm.serializer.kryo.KryoTranscoderFactory"
sticky="<%= node['tomcat']['memcached']['sticky'] %>"
sessionBackupAsync="<%= node['tomcat']['memcached']['sessionBackupAsync'] %>"
copyCollectionsForSerialization="<%= node['tomcat']['memcached']['copyCollectionsForSerialization'] %>"
/>
</Context>

0 comments on commit 3425685

Please sign in to comment.