diff --git a/attributes/default.rb b/attributes/default.rb index 804f8f4b..0a6d1658 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -153,8 +153,8 @@ default['tomcat']['context_dir'] = "#{node['tomcat']['config_dir']}\\Catalina\\localhost" default['tomcat']['webapp_dir'] = "#{node['tomcat']['base']}\\webapps" default['tomcat']['keytool'] = 'keytool' - default['tomcat']['openssl_dir'] = "#{ENV['SYSTEMDRIVE']}\\Program Files (x86)\\Git\\ssl" - default['tomcat']['openssl'] = "#{ENV['SYSTEMDRIVE']}\\Program Files (x86)\\Git\\bin\\openssl" + default['tomcat']['openssl_dir'] = "#{ENV['SYSTEMDRIVE']}\\Program Files (x86)\\Git\\mingw32\\ssl" + default['tomcat']['openssl'] = "#{ENV['SYSTEMDRIVE']}\\Program Files (x86)\\Git\\mingw32\\bin\\openssl" default['tomcat']['lib_dir'] = "#{node['tomcat']['base']}\\lib" default['tomcat']['endorsed_dir'] = "#{node['tomcat']['base']}\\endorsed" default['tomcat']['packages'] = ["apache-tomcat-#{node['tomcat']['base_version']}.#{node['tomcat']['windows']['minor_version']}.#{node['tomcat']['windows']['revision_version']}-windows-#{node['tomcat']['windows']['processor_architecture']}.zip"] diff --git a/metadata.rb b/metadata.rb index 9b35883b..123f297d 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache 2.0' description 'Installs and configures Apache Tomcat' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.19.0' +version '0.20.0' depends 'java' depends 'openssl'