Download as
Browse Code »

Commit d921f8720a5d8c8e922ac9d06a41edc1d4290f2f

Authored by Evandro Junior
1 parent 9137af03
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

corrected default proxy value

Showing 3 changed files with 4 additions and 3 deletions   Show diff stats
plugins/community_hub/lib/community_hub_plugin/hub.rb
  Diff comments   View file @d921f87
... ... @@ -6,7 +6,7 @@ class CommunityHubPlugin::Hub < Folder
6 6 @@twitter_thread_started = false #change to hash
7 7 @@facebook_thread_started = false #change to hash
8 8  
9   - settings_items :proxy_url, :type => :string, :default => 'http://161.148.1.167:312' # Remember to use add the port, if needed!
  9 + settings_items :proxy_url, :type => :string, :default => 'http://161.148.1.167:3128' # Remember to use add the port, if needed!
10 10 settings_items :twitter_enabled, :type => :boolean, :default => false
11 11 settings_items :hashtags_twitter, :type => :string, :default => "participa.br,participabr,arenanetmundial,netmundial"
12 12 settings_items :facebook_enabled, :type => :boolean, :default => false
... ... @@ -47,6 +47,7 @@ class CommunityHubPlugin::Hub < Folder
47 47 end
48 48 end
49 49  
  50 + #Faraday.new(:proxy => { :uri => 'http://proxy.example.com', :user => 'foo', :password => 'bar' })
50 51 def self.facebook_service(hub, action)
51 52 author_id = 54
52 53 if action==:start
... ...
plugins/community_hub/tweeter_stream/lib/twurl/stream.rb
  Diff comments   View file @d921f87
... ... @@ -20,7 +20,7 @@ module Twurl
20 20 Twurl.options = Options.new
21 21 Twurl.options.command = 'request' # Not necessary anymore
22 22 Twurl.options.data = {"track"=>tags}
23   -# Twurl.options.proxy = 'http://161.148.1.167:312' # Use for production mode at SERPRO
  23 +# Twurl.options.proxy = 'http://161.148.1.167:3128' # Use for production mode at SERPRO
24 24 Twurl.options.proxy = proxy unless proxy.nil? or proxy == ''
25 25 Twurl.options.trace = false
26 26 Twurl.options.headers = {}
... ...
plugins/community_hub/views/cms/community_hub_plugin/_hub.rhtml
  Diff comments   View file @d921f87
... ... @@ -14,7 +14,7 @@
14 14 </div>
15 15 <br />
16 16 <div>
17   - <%= 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)) %>
  17 + <%= 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)) %>
18 18 </div>
19 19 <br />
20 20 <div>
... ...