From d921f8720a5d8c8e922ac9d06a41edc1d4290f2f Mon Sep 17 00:00:00 2001 From: Evandro Junior Date: Tue, 15 Apr 2014 18:32:54 +0000 Subject: [PATCH] corrected default proxy value --- plugins/community_hub/lib/community_hub_plugin/hub.rb | 3 ++- plugins/community_hub/tweeter_stream/lib/twurl/stream.rb | 2 +- plugins/community_hub/views/cms/community_hub_plugin/_hub.rhtml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/community_hub/lib/community_hub_plugin/hub.rb b/plugins/community_hub/lib/community_hub_plugin/hub.rb index 14b87df..bc9017b 100644 --- a/plugins/community_hub/lib/community_hub_plugin/hub.rb +++ b/plugins/community_hub/lib/community_hub_plugin/hub.rb @@ -6,7 +6,7 @@ class CommunityHubPlugin::Hub < Folder @@twitter_thread_started = false #change to hash @@facebook_thread_started = false #change to hash - settings_items :proxy_url, :type => :string, :default => 'http://161.148.1.167:312' # Remember to use add the port, if needed! + settings_items :proxy_url, :type => :string, :default => 'http://161.148.1.167:3128' # Remember to use add the port, if needed! settings_items :twitter_enabled, :type => :boolean, :default => false settings_items :hashtags_twitter, :type => :string, :default => "participa.br,participabr,arenanetmundial,netmundial" settings_items :facebook_enabled, :type => :boolean, :default => false @@ -47,6 +47,7 @@ class CommunityHubPlugin::Hub < Folder end end + #Faraday.new(:proxy => { :uri => 'http://proxy.example.com', :user => 'foo', :password => 'bar' }) def self.facebook_service(hub, action) author_id = 54 if action==:start diff --git a/plugins/community_hub/tweeter_stream/lib/twurl/stream.rb b/plugins/community_hub/tweeter_stream/lib/twurl/stream.rb index a7b69cd..0cc38b2 100755 --- a/plugins/community_hub/tweeter_stream/lib/twurl/stream.rb +++ b/plugins/community_hub/tweeter_stream/lib/twurl/stream.rb @@ -20,7 +20,7 @@ module Twurl Twurl.options = Options.new Twurl.options.command = 'request' # Not necessary anymore Twurl.options.data = {"track"=>tags} -# Twurl.options.proxy = 'http://161.148.1.167:312' # Use for production mode at SERPRO +# Twurl.options.proxy = 'http://161.148.1.167:3128' # Use for production mode at SERPRO Twurl.options.proxy = proxy unless proxy.nil? or proxy == '' Twurl.options.trace = false Twurl.options.headers = {} diff --git a/plugins/community_hub/views/cms/community_hub_plugin/_hub.rhtml b/plugins/community_hub/views/cms/community_hub_plugin/_hub.rhtml index 1227eeb..b925359 100644 --- a/plugins/community_hub/views/cms/community_hub_plugin/_hub.rhtml +++ b/plugins/community_hub/views/cms/community_hub_plugin/_hub.rhtml @@ -14,7 +14,7 @@
- <%= labelled_form_field(_('Proxy URL[:port] leave blank for none (example: http://161.148.1.167:312)'), text_field(:article, :proxy_url, :size => '64', :maxlength => 150)) %> + <%= labelled_form_field(_('Proxy URL[:port] leave blank for none (example: http://161.148.1.167:3128)'), text_field(:article, :proxy_url, :size => '64', :maxlength => 150)) %>

-- libgit2 0.21.2