Move Mastodon nginx to proxy/LB #452

Merged
greg merged 11 commits from feature/mastodon_nginx into master 2022-12-08 13:07:35 +00:00
4 changed files with 8 additions and 1 deletions
Showing only changes of commit f3ca307e64 - Show all commits

View File

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

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"]["streaming_port"] = 4000
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"]["sidekiq_threads"] = 25
node.default["kosmos-mastodon"]["onion_address"] = nil

View File

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

View File

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