Refactor tor usage entirely
Use a custom resource and separate recipe for service configs with pre-set keys and hostnames
This commit is contained in:
@@ -85,7 +85,7 @@ ruby_block "read-hostnames" do
|
||||
block do
|
||||
# Set generated hostname for hidden services
|
||||
node['tor']['HiddenServices'].each do |name, service|
|
||||
path = File.join(service['HiddenServiceDir'], "/hostname")
|
||||
path = "/var/lib/tor/#{name}/hostname"
|
||||
node.normal['tor']['HiddenServices'][name]['hostname'] = File.read(path).strip()
|
||||
end
|
||||
end
|
||||
@@ -96,10 +96,6 @@ template '/etc/tor/torrc' do
|
||||
source 'torrc.erb'
|
||||
notifies :restart, 'service[tor]', :immediately
|
||||
notifies :run, "ruby_block[read-hostnames]"
|
||||
# Set default HiddenServiceDir
|
||||
node['tor']['HiddenServices'].each do |name, service|
|
||||
node.default['tor']['HiddenServices'][name]['HiddenServiceDir'] = File.join("/var/lib/tor/", name, "/")
|
||||
end
|
||||
end
|
||||
|
||||
# Install exit policy notice
|
||||
|
||||
Reference in New Issue
Block a user