From a65d7fb418a335739daf33f7950963a011ea0df8 Mon Sep 17 00:00:00 2001
From: davor <vorgrimmlerdavid@gmx.de>
Date: Tue, 28 Aug 2012 12:35:14 +0300
Subject: Read http proxy from config/production.yaml

---
 lib/rest_client_wrapper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/rest_client_wrapper.rb b/lib/rest_client_wrapper.rb
index adcd5aa..fc2bb19 100644
--- a/lib/rest_client_wrapper.rb
+++ b/lib/rest_client_wrapper.rb
@@ -73,8 +73,7 @@ module OpenTox
         if uri.include?(`hostname`.strip)
           RestClient.proxy = nil
         else
-          #RestClient.proxy = ENV['http_proxy'] # set to http proxy uri
-          RestClient.proxy = nil
+          CONFIG[:http_proxy] ? RestClient.proxy = CONFIG[:http_proxy] : RestClient.proxy = nil
         end
         
         resource = RestClient::Resource.new(uri,{:timeout => 600})
-- 
cgit v1.2.3