Rework inclusion of app specific apache config snippets.

sborsje · Aug 5, 2011 · 88d6534 · 88d6534
1 parent 0211aec
commit 88d6534
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/apache2/definitions/web_app.rb b/apache2/definitions/web_app.rb
@@ -26,23 +26,9 @@
   include_recipe "apache2::mod_deflate"
   include_recipe "apache2::mod_headers"
 
-  ruby_block 'Detect includes for vhost' do
-    inner_params = params
-    inner_application_name = application_name
-    inner_node = node
-
-    block do
-      if File.exists?(local_config = "#{inner_node[:apache][:dir]}/sites-available/#{inner_application_name}.conf.d/local")
-        Chef::Log.info("local config for #{inner_application_name} detected")
-        inner_params[:local_config] = local_config
-      end
-
-      if File.exists?(rewrite_config = "#{inner_node[:apache][:dir]}/sites-available/#{inner_application_name}.conf.d/rewrite")
-        Chef::Log.info("rewrite config for #{inner_application_name} detected")
-        inner_params[:rewrite_config] = rewrite_config
-      end
-    end
-  end
+  directory "#{node[:apache][:dir]}/sites-available/#{application_name}.conf.d"
+  params[:rewrite_config] = "#{node[:apache][:dir]}/sites-available/#{application_name}.conf.d/rewrite"
+  params[:local_config] = "#{node[:apache][:dir]}/sites-available/#{application_name}.conf.d/local"
 
   template "#{node[:apache][:dir]}/sites-available/#{application_name}.conf" do
     Chef::Log.debug("Generating Apache site template for #{application_name.inspect}")

diff --git a/mod_php5_apache2/templates/default/web_app.conf.erb b/mod_php5_apache2/templates/default/web_app.conf.erb
@@ -30,19 +30,15 @@
   FileETag none
 
   RewriteEngine On
-  <% if @params[:rewrite_config] %>
-  Include <%= @params[:rewrite_config] %>
-  <% end %>
+  Include <%= @params[:rewrite_config] %>*
   RewriteLog <%= node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log
   RewriteLogLevel 0
 
   <% if @params[:mounted_at] -%>
   AliasMatch ^<%= @params[:mounted_at] %>/(.*)$ <%= @params[:docroot] %>$1
   <% end -%>
 
-  <% if @params[:local_config] %>
-  Include <%= @params[:local_config] %>
-  <% end %>
+  Include <%= @params[:local_config] %>*
 </VirtualHost>
 
 <% if node[:deploy][@application_name][:ssl_support] -%>

diff --git a/passenger_apache2/templates/default/web_app.conf.erb b/passenger_apache2/templates/default/web_app.conf.erb
@@ -38,9 +38,7 @@
   FileETag none
 
   RewriteEngine On
-  <% if @params[:rewrite_config] %>
-  Include <%= @params[:rewrite_config] %>
-  <% end %>
+  Include <%= @params[:rewrite_config] %>*
   RewriteLog <%= node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log
   RewriteLogLevel 0
 
@@ -53,9 +51,7 @@
   RewriteCond %{SCRIPT_FILENAME} !maintenance.html
   RewriteRule ^.*$ /system/maintenance.html [L]
 
-  <% if @params[:local_config] %>
-  Include <%= @params[:local_config] %>
-  <% end %>
+  Include <%= @params[:local_config] %>*
 </VirtualHost>
 
 <% if node[:deploy][@application_name][:ssl_support] -%>