Merge pull request voxpupuli#526 from asgoodasnu/rewrites_in_fastcgi

moves rewrite_rules to location_header
cegeka · Dec 11, 2014 · a8ab09e · a8ab09e
2 parents a455638 + d550c9b
commit a8ab09e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 52 deletions.
diff --git a/spec/defines/resource_location_spec.rb b/spec/defines/resource_location_spec.rb
@@ -134,6 +134,26 @@
           ],
           :match => /^\s+if \(a\) {\n\s++b;\n\s+\}/,
         },
+        {
+          :title => 'should contain rewrite rules',
+          :attr  => 'rewrite_rules',
+          :value => [
+            '^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last',
+            '^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.ra  last',
+            '^/users/(.*)$ /show?user=$1? last',
+          ],
+          :match => [
+            /rewrite \^\(\/download\/\.\*\)\/media\/\(\.\*\)\\\.\.\*\$ \$1\/mp3\/\$2\.mp3 last/,
+            /rewrite \^\(\/download\/\.\*\)\/media\/\(\.\*\)\\\.\.\*\$ \$1\/mp3\/\$2\.ra  last/,
+            /rewrite \^\/users\/\(\.\*\)\$ \/show\?user=\$1\? last/,
+          ],
+        },
+        {
+          :title    => 'should not set rewrite_rules',
+          :attr     => 'rewrite_rules',
+          :value    => [],
+          :notmatch => /rewrite/
+        },
       ].each do |param|
         context "when #{param[:attr]} is #{param[:value]}" do
           let :default_params do { :location => 'location', :proxy => 'proxy_value', :vhost => 'vhost1' } end
@@ -304,26 +324,6 @@
           :value => ['name1','name2'],
           :match => '    index     name1 name2;',
         },
-        {
-          :title => 'should contain rewrite rules',
-          :attr  => 'rewrite_rules',
-          :value => [
-            '^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last',
-            '^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last',
-            '^/users/(.*)$ /show?user=$1? last',
-          ],
-          :match => [
-            '    rewrite ^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last;',
-            '    rewrite ^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last;',
-            '    rewrite ^/users/(.*)$ /show?user=$1? last;',
-          ],
-        },
-        {
-          :title    => 'should not set rewrite_rules',
-          :attr     => 'rewrite_rules',
-          :value    => [],
-          :notmatch => /rewrite/
-        },
         {
           :title => 'should set auth_basic',
           :attr  => 'auth_basic',
@@ -596,26 +596,6 @@
           :value => 'value',
           :match => %r'\s+proxy_set_body\s+value;',
         },
-        {
-          :title => 'should contain rewrite rules',
-          :attr  => 'rewrite_rules',
-          :value => [
-            '^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last',
-            '^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last',
-            '^/users/(.*)$ /show?user=$1? last',
-          ],
-          :match => [
-            '    rewrite ^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last;',
-            '    rewrite ^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last;',
-            '    rewrite ^/users/(.*)$ /show?user=$1? last;',
-          ],
-        },
-        {
-          :title    => 'should not set rewrite_rules',
-          :attr     => 'rewrite_rules',
-          :value    => [],
-          :notmatch => /rewrite/
-        },
       ].each do |param|
         context "when #{param[:attr]} is #{param[:value]}" do
           let :default_params do { :location => 'location', :proxy => 'proxy_value', :vhost => 'vhost1' } end

diff --git a/templates/vhost/location_header.erb b/templates/vhost/location_header.erb
@@ -54,3 +54,9 @@
     <%= line %>
     <%- end -%>
 <% end -%>
+<%- unless @rewrite_rules.nil? || @rewrite_rules.empty? -%>
+
+    <%- @rewrite_rules.each do |rewrite_rule| -%>
+    rewrite <%= rewrite_rule %>;
+    <%- end -%>
+<% end -%>
diff --git a/templates/vhost/locations/directory.erb b/templates/vhost/locations/directory.erb
@@ -11,12 +11,6 @@
 <% if @try_files -%>
     try_files<% @try_files.each do |try| -%> <%= try %><% end -%>;
 <% end -%>
-<%- unless @rewrite_rules.nil? || @rewrite_rules.empty? -%>
-
-    <%- @rewrite_rules.each do |rewrite_rule| -%>
-    rewrite <%= rewrite_rule %>;
-    <%- end -%>
-<% end -%>
 <% if instance_variables.any? { |iv| iv.to_s.include? 'auth_basic' } -%>
 
     <%- if @auth_basic -%>

diff --git a/templates/vhost/locations/proxy.erb b/templates/vhost/locations/proxy.erb
@@ -21,12 +21,6 @@
 <% if @proxy_cache_valid -%>
     proxy_cache_valid     <%= @proxy_cache_valid %>;
 <% end -%>
-<%- unless @rewrite_rules.nil? || @rewrite_rules.empty? -%>
-
-    <%- @rewrite_rules.each do |rewrite_rule| -%>
-    rewrite <%= rewrite_rule %>;
-    <%- end -%>
-<% end -%>
 <% if instance_variables.any? { |iv| iv.to_s.include? 'auth_basic' } -%>
 
     <%- if @auth_basic -%>