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

Refactor tor usage, set up new tor proxy on draco

Browse Source
This commit is contained in:
Râu Cao
2023-07-29 16:26:20 +02:00
parent b149264919
commit cb0fc27134
9 changed files with 91 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
site-cookbooks/kosmos-mastodon/metadata.rb
View File

@@ -11,7 +11,6 @@ depends 'elasticsearch'
depends 'java'
depends 'firewall'
depends 'redisio'
depends 'tor-full'
depends 'postgresql'
depends 'kosmos-nodejs'
depends 'kosmos_openresty'

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

@@ -37,7 +37,8 @@ tls_cert_for server_name do
action :create
end
onion_address = File.read("/var/lib/tor/web/hostname").strip rescue nil rescue nil
tor_services = data_bag_item('credentials', 'tor')['services']
onion_address = tor_services['web']['hostname']
openresty_site server_name do
template 'nginx_conf_mastodon.erb'

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

@@ -36,12 +36,12 @@ server {
<% if @onion_address %>
server {
listen <%= "#{node['openresty']['listen_ip']}:" if node['openresty']['listen_ip'] %>80;
listen 127.0.0.1:80;
server_name mastodon.<%= @onion_address %>;
include <%= @shared_config_path %>;
}
server {
listen <%= "#{node['openresty']['listen_ip']}:" if node['openresty']['listen_ip'] %>443 ssl http2;
listen 127.0.0.1:443 ssl http2;
server_name mastodon.<%= @onion_address %>;
include <%= @shared_config_path %>;