fix munin 1

[mirror/dsa-puppet.git] / modules / debian-org / lib / facter / onion-services.rb

diff --git a/modules/debian-org/lib/facter/onion-services.rb b/modules/debian-org/lib/facter/onion-services.rb
index 08aa134..c444ec2 100644 (file)
--- a/modules/debian-org/lib/facter/onion-services.rb
+++ b/modules/debian-org/lib/facter/onion-services.rb
@@ -1,13 +1,35 @@
-Facter.add("onion_hostname") do
-       services = {}
-
-       Dir['/var/lib/tor/onion/*/hostname'].each do |p|
-               dir = File.dirname(p)
-               service = File.basename(dir)
-               hostname = IO.read(p).chomp
-               services[service] = hostname
-       end
-       setcode do
-               services
-       end
+begin
+    require 'json'
+
+    Facter.add("onion_tor_service_hostname") do
+        services = {}
+
+        Dir['/var/lib/tor/onion/*/hostname'].each do |p|
+            dir = File.dirname(p)
+            service = File.basename(dir)
+            hostname = IO.read(p).chomp
+            services[service] = hostname
+        end
+        setcode do
+            services.to_json
+        end
+    end
+
+    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(['/usr/local/bin/tor-onion-name', p]).read.chomp
+            rescue Errno::ENOENT
+            end
+        end
+        setcode do
+            services.to_json
+        end
+    end
+
+
+rescue Exception => e
 end