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

This commit was merged in pull request #98.
This commit is contained in:
2019-09-11 12:53:50 +00:00
committed by Gitea
4 changed files with 16 additions and 10 deletions

View File

@@ -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"]
}

View File

@@ -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"