Merge pull request #175 from intercity/redirect-domains

Allow redirect domains for passenger stack as well

CHANGELOG.md

@@ -14,7 +14,7 @@ This project makes use of the [Sementic Versioning](http://semver.org/)
 - Nothing
 
 ### Fixed
-- Nothing
+- Allow redirect domains to be set for the Passenger stack as well
 
 ### Misc
 - Downgraded to ruby 2.1.5

vendor/cookbooks/rails/recipes/passenger.rb

@@ -133,6 +133,7 @@
         name: app,
         rails_env: rails_env,
         domain_names: app_info["domain_names"],
+        redirect_domain_names: app_info["redirect_domain_names"],
         enable_ssl: File.exists?("#{applications_root}/#{app}/shared/config/certificate.crt"),
         custom_configuration: nginx_custom_configuration(app_info))
       notifies :reload, resources(:service => "nginx")

vendor/cookbooks/rails/templates/default/app_passenger_nginx.conf.erb

@@ -1,5 +1,16 @@
 <%= @custom_configuration["before_server"] %>
 
+<% if @redirect_domain_names && @redirect_domain_names.any? %>
+server {
+  listen <%= node['nginx']['port'] || '80' %>;
+  <% if @enable_ssl %>
+  listen 443 ssl;
+  <% end %>
+  server_name <%= @redirect_domain_names.join(' ') %>;
+  return 301 $scheme://<%= @domain_names.first %>$request_uri;
+}
+<% end %>
+
 server {
   listen <%= node['nginx']['port'] || '80' %>;
   server_name <%= @domain_names.join(' ') %>;