From 62826d9ac1d4d6ae59c9d6b5cfd8d39e670795f4 Mon Sep 17 00:00:00 2001
From: "Carl P. Corliss" <rabbitt@gmail.com>
Date: Mon, 23 Jun 2014 11:28:52 -0400
Subject: [PATCH] use return instead of rewrite for simple redirects (e.g., www
 -> naked domain)

---
 spec/defines/resource_vhost_spec.rb  | 24 ++++++++++++------------
 templates/vhost/vhost_footer.erb     |  6 +++---
 templates/vhost/vhost_ssl_footer.erb |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/spec/defines/resource_vhost_spec.rb b/spec/defines/resource_vhost_spec.rb
index c43b47eb5..419f4b806 100644
--- a/spec/defines/resource_vhost_spec.rb
+++ b/spec/defines/resource_vhost_spec.rb
@@ -232,9 +232,9 @@
           :attr  => 'rewrite_www_to_non_www',
           :value => true,
           :match => [
-            '  listen                *:80;',
-            '  server_name           www.rspec.example.com;',
-            '  rewrite               ^ http://rspec.example.com$uri permanent;',
+            '  listen       *:80;',
+            '  server_name  www.rspec.example.com;',
+            '  return       301 http://rspec.example.com$uri;',
           ],
         },
         {
@@ -242,9 +242,9 @@
           :attr     => 'rewrite_www_to_non_www',
           :value    => false,
           :notmatch => [
-            /  listen                \*:80;/,
-            /  server_name           www\.rspec\.example\.com;/,
-            /  rewrite               \^ http:\/\/rspec\.example\.com\$uri permanent;/,
+            %r|  listen       \*:80;|,
+            %r|  server_name  www\.rspec\.example\.com;|,
+            %r|  return       301 http://rspec\.example\.com\$uri;|
           ],
         },
       ].each do |param|
@@ -476,9 +476,9 @@
           :attr  => 'rewrite_www_to_non_www',
           :value => true,
           :match => [
-            '  listen                *:443 ssl;',
-            '  server_name           www.rspec.example.com;',
-            '  rewrite               ^ https://rspec.example.com$uri permanent;',
+            '  listen       *:443 ssl;',
+            '  server_name  www.rspec.example.com;',
+            '  return       301 https://rspec.example.com$uri;',
           ],
         },
         {
@@ -486,9 +486,9 @@
           :attr     => 'rewrite_www_to_non_www',
           :value    => false,
           :notmatch => [
-            /  listen                \*:443 ssl;/,
-            /  server_name           www\.rspec\.example\.com;/,
-            /  rewrite               \^ https:\/\/rspec\.example\.com\$uri permanent;/,
+            %r|  listen       \*:443 ssl;|,
+            %r|  server_name  www\.rspec\.example\.com;|,
+            %r|  return       301 https://rspec\.example\.com\$uri;|
           ],
         },
       ].each do |param|
diff --git a/templates/vhost/vhost_footer.erb b/templates/vhost/vhost_footer.erb
index b4a4d7eb6..456f18037 100644
--- a/templates/vhost/vhost_footer.erb
+++ b/templates/vhost/vhost_footer.erb
@@ -18,8 +18,8 @@ include <%= file %>;
 }
 <% if @rewrite_www_to_non_www -%>
 server {
-  listen                <%= @listen_ip %>:<%= @listen_port %>;
-  server_name           www.<%= @name.gsub(/^www\./, '') %>;
-  rewrite               ^ http://<%= @name.gsub(/^www\./, '') %>$uri permanent;
+  listen       <%= @listen_ip %>:<%= @listen_port %>;
+  server_name  www.<%= @name.gsub(/^www\./, '') %>;
+  return       301 http://<%= @name.gsub(/^www\./, '') %>$uri;
 }
 <% end -%>
diff --git a/templates/vhost/vhost_ssl_footer.erb b/templates/vhost/vhost_ssl_footer.erb
index 86419a232..36df452b3 100644
--- a/templates/vhost/vhost_ssl_footer.erb
+++ b/templates/vhost/vhost_ssl_footer.erb
@@ -26,8 +26,8 @@ include <%= file %>;
 }
 <% if @rewrite_www_to_non_www -%>
 server {
-  listen                <%= @listen_ip %>:<%= @ssl_port %> ssl;
-  server_name           www.<%= @name.gsub(/^www\./, '') %>;
-  rewrite               ^ https://<%= @name.gsub(/^www\./, '') %>$uri permanent;
+  listen       <%= @listen_ip %>:<%= @ssl_port %> ssl;
+  server_name  www.<%= @name.gsub(/^www\./, '') %>;
+  return       301 https://<%= @name.gsub(/^www\./, '') %>$uri;
 }
 <% end %>