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

Move the hidden service attributes to the attributes file

Browse Source 
When it is set in the recipe the hidden service dir doesn't get set
correctly (nil), resulting in a broken torrc file
This commit is contained in:
Greg Karékinian
2019-09-11 13:47:42 +02:00
parent 79b1025836
commit 2ecc128abd
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
site-cookbooks/kosmos-ejabberd/attributes/default.rb
View File

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

9
site-cookbooks/kosmos-ejabberd/recipes/default.rb
View File

@@ -134,11 +134,6 @@ end
#
# Tor hidden service
#
node.override["tor"]["HiddenServices"]["ejabberd"] = {
"HiddenServicePorts" => [
"5222 127.0.0.1:5222",
"5223 127.0.0.1:5223",
"5269 127.0.0.1:5269"
]
}
# 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"