X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fonion-services.rb;h=c444ec2d11ad61863446d53e2999496342d9d967;hb=a378dbd84f1d070367de280b01f540084ee3f60c;hp=8222df4281b08444f6c8ecb66971ea99d696ad6d;hpb=fcb00b60d810f7fd29a661590afb0ac24f686a83;p=mirror%2Fdsa-puppet.git diff --git a/modules/debian-org/lib/facter/onion-services.rb b/modules/debian-org/lib/facter/onion-services.rb index 8222df428..c444ec2d1 100644 --- a/modules/debian-org/lib/facter/onion-services.rb +++ b/modules/debian-org/lib/facter/onion-services.rb @@ -1,7 +1,7 @@ begin require 'json' - Facter.add("onion_hostname") do + Facter.add("onion_tor_service_hostname") do services = {} Dir['/var/lib/tor/onion/*/hostname'].each do |p| @@ -15,13 +15,13 @@ begin end end - Facter.add("onionbalance_hostname") do + Facter.add("onion_balance_service_hostname") do services = {} Dir['/etc/onionbalance/private_keys/*.key'].each do |p| service = File.basename(p, '.key') begin - services[service] = IO.popen(['tor-onion-name', p]).read.chomp + services[service] = IO.popen(['/usr/local/bin/tor-onion-name', p]).read.chomp rescue Errno::ENOENT end end