Refactor tor usage entirely

Use a custom resource and separate recipe for service configs with
pre-set keys and hostnames

site-cookbooks/tor-full/recipes/default.rb

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

site-cookbooks/tor-full/templates/default/torrc.erb

@@ -88,7 +88,7 @@ DataDirectory <%= node['tor']['DataDirectory'] %>
 #HiddenServicePort 22 127.0.0.1:22
 <% node['tor']['HiddenServices'].each do |name, service| -%>
 
-HiddenServiceDir <%= service['HiddenServiceDir'] %>
+HiddenServiceDir /var/lib/tor/<%= name %>/
 	<% service['HiddenServicePorts'].each do |port| -%>
 HiddenServicePort <%= port %>
 	<% end -%>