X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fonion-services.rb;h=c444ec2d11ad61863446d53e2999496342d9d967;hb=f01ae912798f256491ed13755113bf403cb48e8e;hp=5e3998febcfbfb39829509e2ae0806ff88dfdcf4;hpb=4921ab7b2bc850505988c8137b35b86269e52c09;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 5e3998feb..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,5 +15,21 @@ begin
         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