Merge pull request #354 from janorn/temp_paths

Add client_body_temp_path and proxy_temp_path to proxy.conf.
voxpupuli · Jun 24, 2014 · 473ed04 · 473ed04
2 parents 5c8fc63 + ebd2a6a
commit 473ed04
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -281,6 +281,18 @@
             'proxy_set_header        header2;',
           ],
         },
+        {
+            :title    => 'should set client_body_temp_path',
+            :attr     => 'client_body_temp_path',
+            :value    => '/path/to/body_temp',
+            :match => 'client_body_temp_path   /path/to/body_temp;',
+        },
+        {
+            :title    => 'should set proxy_temp_path',
+            :attr     => 'proxy_temp_path',
+            :value    => '/path/to/proxy_temp',
+            :match => 'proxy_temp_path         /path/to/proxy_temp;',
+        },
       ].each do |param|
         context "when #{param[:attr]} is #{param[:value]}" do
           let :params do { param[:attr].to_sym => param[:value] } end

diff --git a/templates/conf.d/proxy.conf.erb b/templates/conf.d/proxy.conf.erb
@@ -1,3 +1,5 @@
+proxy_temp_path         <%= @proxy_temp_path %>;
+client_body_temp_path   <%= @client_body_temp_path %>;
 proxy_redirect          <%= @proxy_redirect %>;
 client_max_body_size    <%= @client_max_body_size %>;
 client_body_buffer_size <%= @client_body_buffer_size %>;