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

site-cookbooks/kosmos-ejabberd/attributes/default.rb

@@ -1,2 +1,10 @@
 node.default["kosmos-ejabberd"]["version"] = "19.02"
 node.default["kosmos-ejabberd"]["checksum"] = "aea550c58e61eab04ca9beb8896d8b04f4a79321c21dee160a67ad6787236f51"
+
+node.override["tor"]["HiddenServices"]["ejabberd"] = {
+  "HiddenServicePorts" => [
+    "5222 127.0.0.1:5222",
+    "5223 127.0.0.1:5223",
+    "5269 127.0.0.1:5269"
+  ]
+}

site-cookbooks/kosmos-ejabberd/recipes/default.rb

@@ -134,11 +134,6 @@ end
 #
 # Tor hidden service
 #
-node.override["tor"]["HiddenServices"]["ejabberd"] = {
+# The attributes for the hidden service are set in attributes/default.rb, due
-  "HiddenServicePorts" => [
+# to the way the tor-full cookbook builds the path to the hidden service dir
-    "5222 127.0.0.1:5222",
-    "5223 127.0.0.1:5223",
-    "5269 127.0.0.1:5269"
-  ]
-}
 include_recipe "tor-full"

site-cookbooks/kosmos-mastodon/attributes/default.rb

@@ -4,3 +4,7 @@ node.default["kosmos-mastodon"]["streaming_port"]  = 4000
 node.default["kosmos-mastodon"]["server_name"]     = "kosmos.social"
 node.default["kosmos-mastodon"]["redis_url"]       = "redis://localhost:6379/1"
 node.default["kosmos-mastodon"]["sidekiq_threads"] = 25
+
+node.override["tor"]["HiddenServices"]["mastodon"] = {
+  "HiddenServicePorts" => ["80 127.0.0.1:80"]
+}

site-cookbooks/kosmos-mastodon/recipes/nginx.rb

@@ -71,7 +71,6 @@ nginx_certbot_site server_name
 #
 # Tor hidden service
 #
-node.override["tor"]["HiddenServices"]["mastodon"]  = {
+# The attributes for the hidden service are set in attributes/default.rb, due
-  "HiddenServicePorts" => ["80 127.0.0.1:80"]
+# to the way the tor-full cookbook builds the path to the hidden service dir
-}
 include_recipe "tor-full"