Merge pull request voxpupuli#349 from rabbitt/feature/return-instead-…

…of-rewrite use 'return' over 'rewrite'
cegeka · Jun 23, 2014 · 3d0ec38 · 3d0ec38
2 parents 559de68 + 62826d9
commit 3d0ec38
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/spec/defines/resource_vhost_spec.rb b/spec/defines/resource_vhost_spec.rb
@@ -232,19 +232,19 @@
           :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;',
           ],
         },
         {
           :title    => 'should not contain www to non-www rewrite',
           :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,19 +476,19 @@
           :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;',
           ],
         },
         {
           :title    => 'should not contain www to non-www rewrite',
           :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
@@ -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
@@ -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 %>