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

Merge pull request 'Re-enable and improve Tor access for kosmos.social' (#292) from feature/mastodon_tor into master

Browse Source 
Reviewed-on: #292
This commit is contained in:
Greg 2021-01-23 13:32:57 +00:00
commit e31f9ced96
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,5 +8,5 @@ node.default["kosmos-mastodon"]["sidekiq_threads"] = 25
node.default["kosmos-mastodon"]["elasticsearch"]["allocated_memory"] = "1536m" node.default["kosmos-mastodon"]["elasticsearch"]["allocated_memory"] = "1536m"
node.override["tor"]["HiddenServices"]["mastodon"] = { node.override["tor"]["HiddenServices"]["mastodon"] = {
"HiddenServicePorts" => ["80 127.0.0.1:80"] "HiddenServicePorts" => ["80 127.0.0.1:80", "443 127.0.0.1:443"]
} }

1
site-cookbooks/kosmos-mastodon/recipes/nginx.rb
View File

@ -6,6 +6,7 @@
mastodon_path = node["kosmos-mastodon"]["directory"] mastodon_path = node["kosmos-mastodon"]["directory"]
server_name = node["kosmos-mastodon"]["server_name"] server_name = node["kosmos-mastodon"]["server_name"]
node.override['nginx']['server_names_hash_bucket_size'] = 128
include_recipe "kosmos-nginx" include_recipe "kosmos-nginx"
directory "#{node['nginx']['dir']}/snippets" do directory "#{node['nginx']['dir']}/snippets" do

13
site-cookbooks/kosmos-mastodon/templates/default/nginx_conf_mastodon.erb
View File

@ -24,3 +24,16 @@ server {
add_header Strict-Transport-Security "max-age=31536000"; add_header Strict-Transport-Security "max-age=31536000";
} }
<% end %> <% end %>
<% if @onion_address %>
server {
listen 443 ssl http2;
server_name mastodon.<%= @onion_address %>;
include <%= @shared_config_path %>;
ssl_certificate <%= @ssl_cert %>;
ssl_certificate_key <%= @ssl_key %>;
add_header Strict-Transport-Security "max-age=31536000";
}
<% end %>