better attribute configuration

willmanio · Aug 29, 2015 · dc4b796 · dc4b796
1 parent c7b7332
commit dc4b796
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -3,7 +3,7 @@
 default['sonarqube']['checksum'] = 'a8d63d837242d0d07c0b3f65cfa9c84d5ae82ee51c6cbb52248bcf0d1bc58491'
 default['sonarqube']['os_kernel'] = 'linux-x86-64'
 
-default['sonarqube']['config']['dir'] = "/opt/sonarqube-#{node['sonarqube']['version']}/conf"
+default['sonarqube']['config']['dir'] = "/opt/sonarqube-%{version}/conf"
 default['sonarqube']['config']['file'] = 'sonar.properties'
 
 default['sonarqube']['user'] = 'sonarqube'

diff --git a/metadata.rb b/metadata.rb
@@ -4,6 +4,6 @@
 license 'MIT'
 description 'Installs/Configures SonarQube'
 long_description 'Installs/Configures SonarQube'
-version '0.3.1'
+version '0.3.2'
 supports 'ubuntu'
 supports 'centos'
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -6,7 +6,7 @@
 sonarqube_user = node['sonarqube']['user']
 sonarqube_group = node['sonarqube']['group']
 
-sonarqube_config_dir = node['sonarqube']['config']['dir']
+sonarqube_config_dir = node['sonarqube']['config']['dir'] % {version: sonarqube_version}
 sonarqube_config_file = node['sonarqube']['config']['file']
 
 sonarqube_zipfile_destination = ::File.join(Chef::Config[:file_cache_path], "sonarqube-#{sonarqube_version}.zip")

diff --git a/test/integration/cookbooks/test/recipes/default.rb b/test/integration/cookbooks/test/recipes/default.rb
@@ -1,5 +1,6 @@
 include_recipe 'apt' if platform?('ubuntu')
 
+node.override['java']['jdk_version'] = '7'
 include_recipe 'java'
 
 include_recipe 'sonarqube'