Merge branch 'bugfix/tor_attributes' of kosmos/chef into master

2019-09-11 12:53:50 +00:00
parent 9c40dcfbf4 2ecc128abd
commit 0ca002c67c
4 changed files with 16 additions and 10 deletions
--- a/site-cookbooks/kosmos-mastodon/recipes/nginx.rb
+++ b/site-cookbooks/kosmos-mastodon/recipes/nginx.rb
@@ -71,7 +71,6 @@ nginx_certbot_site server_name
 #
 # Tor hidden service
 #
-node.override["tor"]["HiddenServices"]["mastodon"]  = {
-  "HiddenServicePorts" => ["80 127.0.0.1:80"]
-}
+# The attributes for the hidden service are set in attributes/default.rb, due
+# to the way the tor-full cookbook builds the path to the hidden service dir
 include_recipe "tor-full"