remove redundant jdbc resource

willmanio · May 6, 2015 · fd6f69c · fd6f69c
1 parent 1266815
commit fd6f69c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 44 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -12,7 +12,7 @@
 default['sonarqube']['web']['host'] = '0.0.0.0'
 default['sonarqube']['web']['context'] = nil
 default['sonarqube']['web']['port'] = 9000
-default['sonarqube']['web']['https']['port'] = -1 #Default value of -1 leaves https disabled
+default['sonarqube']['web']['https']['port'] = -1 # Default value of -1 leaves https disabled
 
 default['sonarqube']['embeddedDatabase']['dataDir'] = nil
 default['sonarqube']['embeddedDatabase']['port'] = 9092
@@ -25,8 +25,8 @@
 default['sonarqube']['jdbc']['maxIdle'] = 5
 default['sonarqube']['jdbc']['minIdle'] = 2
 default['sonarqube']['jdbc']['maxWait'] = 5000
-default['sonarqube']['jdbc']['minEvictableIdleTimeMillis'] = 600000
-default['sonarqube']['jdbc']['timeBetweenEvictionRunsMillis'] = 30000
+default['sonarqube']['jdbc']['minEvictableIdleTimeMillis'] = 600_000
+default['sonarqube']['jdbc']['timeBetweenEvictionRunsMillis'] = 30_000
 
 default['sonarqube']['web']['https']['keyAlias'] = nil
 default['sonarqube']['web']['https']['keyPass'] = 'changeit'
@@ -64,6 +64,6 @@
 default['sonarqube']['rails']['dev'] = false
 
 default['sonarqube']['extra_properties'] = [
- #'sonar.security.realm=LDAP',
- #'sonar.security.savePassword=false'
+ # 'sonar.security.realm=LDAP',
+ # 'sonar.security.savePassword=false'
 ]
diff --git a/libraries/matchers.rb b/libraries/matchers.rb
diff --git a/providers/jdbc.rb b/providers/jdbc.rb
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -46,7 +46,7 @@
 end
 
 template "#{sonarqube_config_dir}/#{sonarqube_config_file}" do
- source "sonar.properties.erb"
+ source 'sonar.properties.erb'
  notifies :restart, 'service[sonarqube]', :delayed
  mode 0600
 end

diff --git a/resources/jdbc.rb b/resources/jdbc.rb
diff --git a/templates/default/sonar.properties.erb b/templates/default/sonar.properties.erb
@@ -1,4 +1,4 @@
-# Generated by Chef for <%= node[:fqdn] %>
+# Generated by Chef for <%= node['fqdn'] %>
 # Local modifications will be overwritten.
 
 # This file must contain only ISO 8859-1 characters