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

Don't fail on first run, when Tor hostname missing

Browse Source
This commit is contained in:
Basti 2021-01-13 09:49:03 +01:00 committed by Greg Karékinian
parent ad64bfc0be
commit 8a870f6fd6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,8 @@ template "#{node['nginx']['dir']}/snippets/mastodon.conf" do
notifies :reload, 'service[nginx]', :delayed notifies :reload, 'service[nginx]', :delayed
end end
onion_address = File.read("/var/lib/tor/mastodon/hostname").strip rescue nil
template "#{node['nginx']['dir']}/sites-available/#{server_name}" do template "#{node['nginx']['dir']}/sites-available/#{server_name}" do
source 'nginx_conf_mastodon.erb' source 'nginx_conf_mastodon.erb'
owner 'www-data' owner 'www-data'
@ -32,7 +34,7 @@ template "#{node['nginx']['dir']}/sites-available/#{server_name}" do
ssl_cert: "/etc/letsencrypt/live/#{server_name}/fullchain.pem", ssl_cert: "/etc/letsencrypt/live/#{server_name}/fullchain.pem",
ssl_key: "/etc/letsencrypt/live/#{server_name}/privkey.pem", ssl_key: "/etc/letsencrypt/live/#{server_name}/privkey.pem",
shared_config_path: "#{node['nginx']['dir']}/snippets/mastodon.conf", shared_config_path: "#{node['nginx']['dir']}/snippets/mastodon.conf",
onion_address: File.read("/var/lib/tor/mastodon/hostname").strip onion_address: onion_address
notifies :reload, 'service[nginx]', :delayed notifies :reload, 'service[nginx]', :delayed
end end

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

@ -1,8 +1,10 @@
<% if @onion_address %>
server { server {
listen 80; listen 80;
server_name mastodon.<%= @onion_address %>; server_name mastodon.<%= @onion_address %>;
include <%= @shared_config_path %>; include <%= @shared_config_path %>;
} }
<% end %>
map $http_upgrade $connection_upgrade { map $http_upgrade $connection_upgrade {
default upgrade; default upgrade;