proxy_apache cleanup

.gitignore

@@ -1,2 +1,10 @@
-.project
-.buildpath
+.vagrant
+Berksfile.lock
+Gemfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+/cookbooks

attributes/default.rb

@@ -32,3 +32,4 @@
 default['sonar']['java_command']           = "java"
 default['sonar']['logfile_maxsize']        = "0"
 default['sonar']['syslog_loglevel']        = "NONE"
+default['sonar']['enable_mod_proxy_ajp']   = false

recipes/proxy_apache.rb

@@ -38,20 +38,13 @@
 
 include_recipe "apache2"
 
-template "sonar_server.conf" do
-  path "#{node[:nginx][:dir]}/sites-enabled/"
-  source "apache_site_#{node['sonar']['web_template']}.erb"
-  owner "root"
-  group "root"
-  mode 0644
-end
-
 if node['sonar']['enable_mod_proxy_ajp'] == true
   include_recipe "apache2::mod_proxy_ajp"
 else 
   include_recipe "apache2::mod_proxy"
 end
 
-apache_site "sonar_server.conf" do
-  enable :true
-end
+web_app node['sonar]['web_domain'] do
+  template "apache_site_#{node['sonar']['web_template']}.erb"
+  server_name node['sonar']['web_domain']
+end

templates/default/apache_site_default.erb

@@ -1,10 +1,12 @@
 ProxyRequests Off
 ProxyPreserveHost On
 <VirtualHost *:80>
-  ServerName <%= node['sonar']['web_domain'] %>
-  ServerAdmin admin@<%= node['sonar']['web_domain'] %>
+  ServerName <%= @params[:server_name] %>
+  ServerAdmin <%= node[:apache][:contact] %>
   ProxyPass / http://<%= node['sonar']['web_host'] %>:<%= node['sonar']['web_port'] %>/
   ProxyPassReverse / http://<%= node['sonar']['web_host'] %>:<%= node['sonar']['web_port'] %>/
-  ErrorLog logs/<%= node['sonar']['web_domain'] %>/sonar/error.log
-  CustomLog logs/<%= node['sonar']['web_domain'] %>/sonar/access.log common
-</VirtualHost>
+
+  LogLevel warn
+  CustomLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
+  ErrorLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
+</VirtualHost>

templates/default/sonar.properties.erb

@@ -120,7 +120,7 @@ sonar.jdbc.timeBetweenEvictionRunsMillis:  30000
 
 # The Update Center requires an internet connection to request http://update.sonarsource.org
 # It is activated by default:
-#sonar.updatecenter.activate=true
+sonar.updatecenter.activate=true
 
 # HTTP proxy (default none)
 #http.proxyHost=