kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

Fix Tor access

Browse Source 
Configure alternate_domains for Rails app to re-enable Tor access (was
throwing 403s without this config)
This commit is contained in:
Râu Cao 2022-11-30 12:06:25 +01:00
parent 66f5217a41
commit f3ca307e64
Signed by: raucao
GPG Key ID: 15E65F399D084BA9
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
environments/production.json
View File

@ -16,6 +16,11 @@
"use_ssl": "false" "use_ssl": "false"
} }
} }
},
"kosmos-mastodon": {
"alternate_domains": [
"mastodon.w7nooprauv6yrnhzh2ajpcnj3doinked2aaztlwfyt6u6pva2qdxqhid.onion"
]
} }
} }
} }

1
site-cookbooks/kosmos-mastodon/attributes/default.rb
View File

@ -5,6 +5,7 @@ node.default["kosmos-mastodon"]["bind_ip"] = "127.0.0.1"
node.default["kosmos-mastodon"]["app_port"] = 3000 node.default["kosmos-mastodon"]["app_port"] = 3000
node.default["kosmos-mastodon"]["streaming_port"] = 4000 node.default["kosmos-mastodon"]["streaming_port"] = 4000
node.default["kosmos-mastodon"]["server_name"] = "kosmos.social" node.default["kosmos-mastodon"]["server_name"] = "kosmos.social"
node.default["kosmos-mastodon"]["alternate_domains"] = []
node.default["kosmos-mastodon"]["redis_url"] = "redis://localhost:6379/0" node.default["kosmos-mastodon"]["redis_url"] = "redis://localhost:6379/0"
node.default["kosmos-mastodon"]["sidekiq_threads"] = 25 node.default["kosmos-mastodon"]["sidekiq_threads"] = 25
node.default["kosmos-mastodon"]["onion_address"] = nil node.default["kosmos-mastodon"]["onion_address"] = nil

2
site-cookbooks/kosmos-mastodon/recipes/default.rb
View File

@ -42,7 +42,6 @@ elasticsearch_service 'elasticsearch'
postgresql_data_bag_item = data_bag_item('credentials', 'postgresql') postgresql_data_bag_item = data_bag_item('credentials', 'postgresql')
mastodon_path = node["kosmos-mastodon"]["directory"] mastodon_path = node["kosmos-mastodon"]["directory"]
mastodon_user = "mastodon" mastodon_user = "mastodon"
bind_ip = if node.chef_environment == "production" bind_ip = if node.chef_environment == "production"
@ -160,6 +159,7 @@ application mastodon_path do
group mastodon_user group mastodon_user
variables redis_url: node["kosmos-mastodon"]["redis_url"], variables redis_url: node["kosmos-mastodon"]["redis_url"],
domain: node["kosmos-mastodon"]["server_name"], domain: node["kosmos-mastodon"]["server_name"],
alternate_domains: node["kosmos-mastodon"]["alternate_domains"],
paperclip_secret: mastodon_credentials['paperclip_secret'], paperclip_secret: mastodon_credentials['paperclip_secret'],
secret_key_base: mastodon_credentials['secret_key_base'], secret_key_base: mastodon_credentials['secret_key_base'],
otp_secret: mastodon_credentials['otp_secret'], otp_secret: mastodon_credentials['otp_secret'],

1
site-cookbooks/kosmos-mastodon/templates/default/env.production.erb
View File

@ -58,3 +58,4 @@ ES_HOST=localhost
ES_PORT=9200 ES_PORT=9200
ALLOW_ACCESS_TO_HIDDEN_SERVICE=true ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
ALTERNATE_DOMAINS='<%= @alternate_domains.join(" ") %>'