From 20b3372f2c4bfab05807acc4b30fe6e9f306e68c Mon Sep 17 00:00:00 2001 From: Enzo Rivello Date: Mon, 23 May 2016 14:57:13 +0100 Subject: [PATCH 1/2] imagemagick bump --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 47c7974..131da58 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -93,7 +93,7 @@ default['java']['jdk']['8']['x86_64']['url'] = 'http://download.oracle.com/otn-pub/java/jdk/8u91-b14/jdk-8u91-linux-x64.tar.gz' default['java']['jdk']['8']['x86_64']['checksum'] = '3f3d7d0cd70bfe0feab382ed4b0e45c0' #3rd-party defaults -default['alfresco']['imagemagick_version'] = "6.9.4-3" +default['alfresco']['imagemagick_version'] = "6.9.4-4" default['alfresco']['use_imagemagick_os_repo'] = true default['alfresco']['imagemagick_libs_name'] = "ImageMagick-libs-#{node['alfresco']['imagemagick_version']}.x86_64.rpm" From bed0fcb080ada62ef4b6e5fe6b1db6aa5ac7b592 Mon Sep 17 00:00:00 2001 From: Enzo Rivello Date: Mon, 23 May 2016 14:57:51 +0100 Subject: [PATCH 2/2] more libraries, fix to chef run --- recipes/_tomcat-attributes.rb | 44 +++++++++++++++++++++++++++++++++++ recipes/tomcat.rb | 10 ++++---- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/recipes/_tomcat-attributes.rb b/recipes/_tomcat-attributes.rb index 4fb5eaf..2a77809 100644 --- a/recipes/_tomcat-attributes.rb +++ b/recipes/_tomcat-attributes.rb @@ -6,6 +6,8 @@ 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" @@ -27,6 +29,48 @@ 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']['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']['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']['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']['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']['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']['type'] = 'jar' +node.default['artifacts']['asm']['destination'] = "#{node['alfresco']['home']}/lib" +node.default['artifacts']['asm']['owner'] = node['alfresco']['user'] + node.default['tomcat']['jvm_route'] = "alfresco-#{node['alfresco']['public_hostname']}" node.default['tomcat']['global_templates'] = [{ diff --git a/recipes/tomcat.rb b/recipes/tomcat.rb index a4cae0a..1cdb71e 100644 --- a/recipes/tomcat.rb +++ b/recipes/tomcat.rb @@ -6,9 +6,10 @@ node.default['artifacts']['catalina-jmx']['enabled'] = true if node['alfresco']['components'].include?("share") && !node["tomcat"]["memcached_nodes"].empty? - node.default['artifacts']['memcached-session-manager']['enabled'] = true - node.default['artifacts']['memcached-session-manager-tc7']['enabled'] = true - node.default['artifacts']['spymemcached']['enabled'] = true + libraries = ['memcached-session-manager','memcached-session-manager-tc7', 'spymemcached','msm-kryo-serializer','kryo','minlog','reflectasm','asm'] + libraries.each do |lib| + node.default['artifacts'][lib]['enabled'] = true + end end context_template_cookbook = node['tomcat']['context_template_cookbook'] @@ -67,7 +68,8 @@ source 'tomcat/share.xml.erb' owner node['alfresco']['user'] owner node['tomcat']['group'] - only_if node['alfresco']['components'].include?("share") && !node["tomcat"]["memcached_nodes"].empty? + only_if { node['alfresco']['components'].include?("share") } + only_if { !node["tomcat"]["memcached_nodes"].empty? } end