From 4889ccb024050b17f479a7520e97b5a732765062 Mon Sep 17 00:00:00 2001 From: Rakesh Patel Date: Tue, 2 Apr 2013 19:42:36 -0700 Subject: [PATCH 1/6] fix to proxy_apache that was referencing nginx directory, also default enable_mod_proxy_ajp to false --- .gitignore | 12 ++++++++++-- attributes/default.rb | 1 + recipes/proxy_apache.rb | 4 ++-- templates/default/sonar.properties.erb | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 32c4421..77cbe8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,10 @@ -.project -.buildpath \ No newline at end of file +.vagrant +Berksfile.lock +Gemfile.lock +*~ +*# +.#* +\#*# +.*.sw[a-z] +*.un~ +/cookbooks diff --git a/attributes/default.rb b/attributes/default.rb index 52dcc7c..9704601 100644 --- a/attributes/default.rb +++ b/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 diff --git a/recipes/proxy_apache.rb b/recipes/proxy_apache.rb index 1d2075c..8737cd2 100644 --- a/recipes/proxy_apache.rb +++ b/recipes/proxy_apache.rb @@ -39,7 +39,7 @@ include_recipe "apache2" template "sonar_server.conf" do - path "#{node[:nginx][:dir]}/sites-enabled/" + path "#{node[:apache2][:dir]}/sites-enabled/" source "apache_site_#{node['sonar']['web_template']}.erb" owner "root" group "root" @@ -54,4 +54,4 @@ apache_site "sonar_server.conf" do enable :true -end \ No newline at end of file +end diff --git a/templates/default/sonar.properties.erb b/templates/default/sonar.properties.erb index f5e3e61..813982c 100644 --- a/templates/default/sonar.properties.erb +++ b/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= From 377cc71f5bb49e84d2d7a37eed0d917e03276de0 Mon Sep 17 00:00:00 2001 From: Rakesh Patel Date: Tue, 2 Apr 2013 19:48:53 -0700 Subject: [PATCH 2/6] apache not apache2 --- recipes/proxy_apache.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/proxy_apache.rb b/recipes/proxy_apache.rb index 8737cd2..7275b2b 100644 --- a/recipes/proxy_apache.rb +++ b/recipes/proxy_apache.rb @@ -39,7 +39,7 @@ include_recipe "apache2" template "sonar_server.conf" do - path "#{node[:apache2][:dir]}/sites-enabled/" + path "#{node[:apache][:dir]}/sites-enabled/" source "apache_site_#{node['sonar']['web_template']}.erb" owner "root" group "root" From 15c0274a2b5ed964a6628e3919b77b3954cc4c98 Mon Sep 17 00:00:00 2001 From: Rakesh Patel Date: Tue, 2 Apr 2013 20:02:23 -0700 Subject: [PATCH 3/6] remove path attribute from template --- recipes/proxy_apache.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/proxy_apache.rb b/recipes/proxy_apache.rb index 7275b2b..5a0853b 100644 --- a/recipes/proxy_apache.rb +++ b/recipes/proxy_apache.rb @@ -38,8 +38,7 @@ include_recipe "apache2" -template "sonar_server.conf" do - path "#{node[:apache][:dir]}/sites-enabled/" +template "#{node[:apache][:dir]}/sites-enabled/sonar_server.conf" do source "apache_site_#{node['sonar']['web_template']}.erb" owner "root" group "root" From 49367862d7fcfbd5213e98acaabcf4603fece7e5 Mon Sep 17 00:00:00 2001 From: Rakesh Patel Date: Tue, 2 Apr 2013 20:12:25 -0700 Subject: [PATCH 4/6] fix apache log dir for apache conf --- templates/default/apache_site_default.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/default/apache_site_default.erb b/templates/default/apache_site_default.erb index 4e70d88..b242144 100644 --- a/templates/default/apache_site_default.erb +++ b/templates/default/apache_site_default.erb @@ -5,6 +5,6 @@ ProxyPreserveHost On ServerAdmin admin@<%= node['sonar']['web_domain'] %> 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 - \ No newline at end of file + ErrorLog <%= node['apache']['log_dir'] %>/<%= node['sonar']['web_domain'] %>/sonar/error.log + CustomLog <%= node['apache']['log_dir'] %>/<%= node['sonar']['web_domain'] %>/sonar/access.log common + From dae4e78d7cb905dbd32850e525ef5c61e3d29e2e Mon Sep 17 00:00:00 2001 From: Rakesh Patel Date: Tue, 2 Apr 2013 20:20:03 -0700 Subject: [PATCH 5/6] fix apache log dir for apache conf --- templates/default/apache_site_default.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/default/apache_site_default.erb b/templates/default/apache_site_default.erb index b242144..da3e7db 100644 --- a/templates/default/apache_site_default.erb +++ b/templates/default/apache_site_default.erb @@ -5,6 +5,6 @@ ProxyPreserveHost On ServerAdmin admin@<%= node['sonar']['web_domain'] %> ProxyPass / http://<%= node['sonar']['web_host'] %>:<%= node['sonar']['web_port'] %>/ ProxyPassReverse / http://<%= node['sonar']['web_host'] %>:<%= node['sonar']['web_port'] %>/ - ErrorLog <%= node['apache']['log_dir'] %>/<%= node['sonar']['web_domain'] %>/sonar/error.log - CustomLog <%= node['apache']['log_dir'] %>/<%= node['sonar']['web_domain'] %>/sonar/access.log common + ErrorLog <%= node['apache']['log_dir'] %>/<%= node['sonar']['web_domain'] %>-error.log + CustomLog <%= node['apache']['log_dir'] %>/<%= node['sonar']['web_domain'] %>-access.log common From cccff4f3acf94636ed650421d5f82a00d06e7b1c Mon Sep 17 00:00:00 2001 From: Sander van Zoest Date: Sat, 13 Apr 2013 21:59:02 -0700 Subject: [PATCH 6/6] use the web_app apache2 definition --- recipes/proxy_apache.rb | 12 +++--------- templates/default/apache_site_default.erb | 10 ++++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/recipes/proxy_apache.rb b/recipes/proxy_apache.rb index 5a0853b..c8363e9 100644 --- a/recipes/proxy_apache.rb +++ b/recipes/proxy_apache.rb @@ -38,19 +38,13 @@ include_recipe "apache2" -template "#{node[:apache][:dir]}/sites-enabled/sonar_server.conf" do - 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 +web_app node['sonar]['web_domain'] do + template "apache_site_#{node['sonar']['web_template']}.erb" + server_name node['sonar']['web_domain'] end diff --git a/templates/default/apache_site_default.erb b/templates/default/apache_site_default.erb index da3e7db..e2df6c2 100644 --- a/templates/default/apache_site_default.erb +++ b/templates/default/apache_site_default.erb @@ -1,10 +1,12 @@ ProxyRequests Off ProxyPreserveHost On - 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 <%= node['apache']['log_dir'] %>/<%= node['sonar']['web_domain'] %>-error.log - CustomLog <%= node['apache']['log_dir'] %>/<%= node['sonar']['web_domain'] %>-access.log common + + LogLevel warn + CustomLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined + ErrorLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log