@@ -16,6 +16,8 @@ rack_app[:database][:user] = rack_app[:name] unless rack_app[:database].has_key? rack_app[:extra_lines] = [] unless rack_app.has_key?(:extra_lines) +rack_app[:redirect] = false unless rack_app.has_key?(:redirect) + unless rack_app[:database].has_key?(:password) password = "" chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a rack_app/attributes/default.rb @@ -23,6 +23,7 @@ web_app rack_app[:name] do docroot "#{rack_app[:path]}/current/public" server_name rack_app[:domain] server_aliases rack_app[:aliases] + redirect rack_app[:redirect] rails_env rack_app[:rails][:environment] end rack_app/recipes/default.rb @@ -22,10 +22,14 @@ RewriteEngine On RewriteLog <%= @node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log RewriteLogLevel 0 + <% if @params[:redirect] %> # Canonical host - # RewriteCond %{HTTP_HOST} !^<%= @params[:server_name] %> [NC] - # RewriteCond %{HTTP_HOST} !^$ - # RewriteRule ^/(.*)$ http://<%= @params[:server_name] %>/$1 [L,R=301] + RewriteCond %{HTTP_HOST} !^<%= @params[:server_name] %> [NC] + RewriteCond %{HTTP_HOST} !^localhost$ + RewriteCond %{HTTP_HOST} !^$ + RewriteCond %{HTTP_HOST} <%= "!^([^.]+.)?assets.#{ @params[:server_name] } [NC]"%> + RewriteRule ^/(.*)$ http://<%= @params[:server_name] %>/$1 [L,R=301] + <% end %> RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f RewriteCond %{SCRIPT_FILENAME} !maintenance.html rack_app/templates/default/web_app.conf.erb 5bdcaf16a9ecd6a960c4b111f603423f804476e1 cea9258388d5943cbc0f4e2e4a378c4387bb3d9f Jamie Dyer jamie@kernowsoul.com http://github.com/theoooo/cookbooks/commit/92523d4effac14239b0205329d45a97ecad57cc6 92523d4effac14239b0205329d45a97ecad57cc6 2009-09-29T03:58:53-07:00 2009-09-29T03:58:53-07:00 Merge branch 'master' of git@github.com:theoooo/cookbooks 71a79c46226732a4384c7f38d414070e52c4c652 Jamie Dyer jamie@kernowsoul.com