initial wiring for outbound proxy

Gemfile

@@ -19,8 +19,8 @@ gem "puma", "6.4.2", require: false
 
 # Federation
 
-gem "diaspora_federation-json_schema", "1.1.0"
+gem "diaspora_federation-json_schema", git: "https://git.gynoid.me/nocebo/diaspora_federation.git", branch: "outbound-proxy"
-gem "diaspora_federation-rails",       "1.1.0"
+gem "diaspora_federation-rails", git: "https://git.gynoid.me/nocebo/diaspora_federation.git", branch: "outbound-proxy"
 
 # API and JSON
 

config/defaults.yml

@@ -94,6 +94,7 @@ defaults:
       suggest_email:
     typhoeus_verbose: false
     typhoeus_concurrency: 20
+    http_proxy:
     archive_jobs_concurrency: 1
     username_blacklist:
       - 'admin'

config/diaspora.toml.example

@@ -328,6 +328,9 @@
 ## of your Sidekiq workers.
 #typhoeus_concurrency = 20
 
+## Outbound HTTP proxy
+#http_proxy = "http://10.0.0.100:1234"
+
 ## Maximum number of parallel user data import/export jobs (default=1)
 ## Be careful, imports and exports of big/old profiles can use a lot of memory,
 ## running many of them in parallel can be a problem for small servers.

config/initializers/diaspora_federation.rb

@@ -11,6 +11,7 @@ DiasporaFederation.configure do |config|
 
   config.http_concurrency = AppConfig.settings.typhoeus_concurrency.to_i
   config.http_verbose = AppConfig.settings.typhoeus_verbose?
+  config.http_proxy = AppConfig.settings.http_proxy
 
   config.define_callbacks do
     on :fetch_person_for_webfinger do |diaspora_id|