nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'wire up outbound proxy to config' (#2) from outbound-proxy into develop
Some checks failed
CI / test (mysql, cucumber, 3.2) (push) Has been cancelled
Details
CI / test (mysql, cucumber, 3.3) (push) Has been cancelled
Details
CI / test (mysql, other, 3.2) (push) Has been cancelled
Details
CI / test (mysql, other, 3.3) (push) Has been cancelled
Details
CI / test (postgresql, cucumber, 3.2) (push) Has been cancelled
Details
CI / test (postgresql, cucumber, 3.3) (push) Has been cancelled
Details
CI / test (postgresql, other, 3.2) (push) Has been cancelled
Details
CI / test (postgresql, other, 3.3) (push) Has been cancelled
Details

Browse source 
Reviewed-on: #2
This commit is contained in:
astra 2024-10-09 01:36:02 +00:00
commit 3697616a80
5 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -19,8 +19,8 @@ gem "puma", "6.4.2", require: false
# Federation # 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 # API and JSON

30
Gemfile.lock
View file

@ -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 GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -184,16 +200,6 @@ GEM
devise_lastseenable (0.0.6) devise_lastseenable (0.0.6)
devise devise
rails (>= 3.0.4) 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-test (1.1.0)
diaspora_federation (= 1.1.0) diaspora_federation (= 1.1.0)
fabrication (~> 2.29) fabrication (~> 2.29)
@ -790,8 +796,8 @@ DEPENDENCIES
devise (= 4.9.4) devise (= 4.9.4)
devise-two-factor (= 4.1.0) devise-two-factor (= 4.1.0)
devise_lastseenable (= 0.0.6) 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) diaspora_federation-test (= 1.1.0)
factory_bot_rails (= 6.4.3) factory_bot_rails (= 6.4.3)
faraday (= 2.9.0) faraday (= 2.9.0)

1
config/defaults.yml
View file

@ -40,6 +40,7 @@ defaults:
debug: debug:
sql: false sql: false
federation: false federation: false
http_proxy:
server: server:
listen: "tcp://127.0.0.1:3000" listen: "tcp://127.0.0.1:3000"
rails_environment: 'development' rails_environment: 'development'

3
config/diaspora.toml.example
View file

@ -65,6 +65,9 @@
## You probably don't want to uncomment or change this. ## You probably don't want to uncomment or change this.
#pubsub_server = "https://pubsubhubbub.appspot.com/" #pubsub_server = "https://pubsubhubbub.appspot.com/"
## Outbound HTTP proxy
#http_proxy = "http://10.0.0.100:1234"
## Sidekiq - background processing ## Sidekiq - background processing
[configuration.environment.sidekiq] [configuration.environment.sidekiq]

3
config/initializers/diaspora_federation.rb
View file

@ -7,10 +7,11 @@ DiasporaFederation.configure do |config|
config.certificate_authorities = AppConfig.environment.certificate_authorities.get 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_concurrency = AppConfig.settings.typhoeus_concurrency.to_i
config.http_verbose = AppConfig.settings.typhoeus_verbose? config.http_verbose = AppConfig.settings.typhoeus_verbose?
config.http_proxy = AppConfig.environment.http_proxy
config.define_callbacks do config.define_callbacks do
on :fetch_person_for_webfinger do |diaspora_id| on :fetch_person_for_webfinger do |diaspora_id|