Merge pull request 'wire up outbound proxy to config' (#2) from outbound-proxy into develop

Reviewed-on: #2

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
 

Gemfile.lock

@@ -1,3 +1,19 @@
+GIT
+  remote: https://git.gynoid.me/nocebo/diaspora_federation.git
+  revision: 931dbdb655079c42954ad09533606740f24ac071
+  branch: outbound-proxy
+  specs:
+    diaspora_federation (1.1.0)
+      faraday (>= 1.0, < 3)
+      faraday-follow_redirects (~> 0.3)
+      nokogiri (~> 1.6, >= 1.6.8)
+      typhoeus (~> 1.0)
+      valid (~> 1.0)
+    diaspora_federation-json_schema (1.1.0)
+    diaspora_federation-rails (1.1.0)
+      actionpack (>= 5.2, < 8)
+      diaspora_federation (= 1.1.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -184,16 +200,6 @@ GEM
     devise_lastseenable (0.0.6)
       devise
       rails (>= 3.0.4)
-    diaspora_federation (1.1.0)
-      faraday (>= 1.0, < 3)
-      faraday-follow_redirects (~> 0.3)
-      nokogiri (~> 1.6, >= 1.6.8)
-      typhoeus (~> 1.0)
-      valid (~> 1.0)
-    diaspora_federation-json_schema (1.1.0)
-    diaspora_federation-rails (1.1.0)
-      actionpack (>= 5.2, < 8)
-      diaspora_federation (= 1.1.0)
     diaspora_federation-test (1.1.0)
       diaspora_federation (= 1.1.0)
       fabrication (~> 2.29)
@@ -790,8 +796,8 @@ DEPENDENCIES
   devise (= 4.9.4)
   devise-two-factor (= 4.1.0)
   devise_lastseenable (= 0.0.6)
-  diaspora_federation-json_schema (= 1.1.0)
+  diaspora_federation-json_schema!
-  diaspora_federation-rails (= 1.1.0)
+  diaspora_federation-rails!
   diaspora_federation-test (= 1.1.0)
   factory_bot_rails (= 6.4.3)
   faraday (= 2.9.0)

config/defaults.yml

@@ -25,6 +25,8 @@ defaults:
       bucket:
       region:
       cache: true
+      host: "s3.amazonaws.com"
+      endpoint: "https://s3.amazonaws.com"
     image_redirect_url:
     assets:
       serve: false
@@ -38,6 +40,7 @@ defaults:
       debug:
         sql: false
         federation: false
+    http_proxy:
   server:
     listen: "tcp://127.0.0.1:3000"
     rails_environment: 'development'

config/diaspora.toml.example

@@ -65,6 +65,9 @@
 ## You probably don't want to uncomment or change this.
 #pubsub_server = "https://pubsubhubbub.appspot.com/"
 
+## Outbound HTTP proxy
+#http_proxy = "http://10.0.0.100:1234"
+
 ## Sidekiq - background processing
 [configuration.environment.sidekiq]
 
@@ -113,6 +116,8 @@
 #secret = "change_me"
 #bucket = "my_photos"
 #region = "us-east-1"
+#host = "s3.amazonaws.com"
+#endpoint = "https://s3.amazonaws.com"
 
 ## Use max-age header on Amazon S3 resources (default=true).
 ## When true, this allows locally cached images to be served for up to

config/initializers/carrierwave.rb

@@ -16,13 +16,18 @@ CarrierWave.configure do |config|
         provider:              'AWS',
         aws_access_key_id:     AppConfig.environment.s3.key.get,
         aws_secret_access_key: AppConfig.environment.s3.secret.get,
-        region:                AppConfig.environment.s3.region.get
+        region:                AppConfig.environment.s3.region.get,
+        host:                  AppConfig.environment.s3.host.get,
+        endpoint:              AppConfig.environment.s3.endpoint.get,
+        # XXX: what does this actually do? does it do anything anymore?
+        path_style:            true
     }
     if AppConfig.environment.s3.cache?
       config.fog_attributes['Cache-Control'] = 'max-age=31536000'
     end
 
     config.fog_directory = AppConfig.environment.s3.bucket.get
+    config.asset_host = AppConfig.environment.image_redirect_url.get
   else
     config.storage = :file
   end

config/initializers/diaspora_federation.rb

@@ -7,10 +7,11 @@ DiasporaFederation.configure do |config|
 
   config.certificate_authorities = AppConfig.environment.certificate_authorities.get
 
-  config.webfinger_http_fallback = Rails.env == "development"
+  config.webfinger_http_fallback = Rails.env.development?
 
   config.http_concurrency = AppConfig.settings.typhoeus_concurrency.to_i
   config.http_verbose = AppConfig.settings.typhoeus_verbose?
+  config.http_proxy = AppConfig.environment.http_proxy
 
   config.define_callbacks do
     on :fetch_person_for_webfinger do |diaspora_id|