remove smtp_sources from ferm's me.conf, retire old-style heavy_{exim,postfix} roles

[mirror/dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / onion_global_service_hostname.rb

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/onion_global_service_hostname.rb b/modules/puppetmaster/lib/puppet/parser/functions/onion_global_service_hostname.rb
index dce7740..22ee3bb 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/onion_global_service_hostname.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/onion_global_service_hostname.rb
@@ -14,7 +14,11 @@ module Puppet::Parser::Functions
     facts = IO.read(fn)
 
     require 'json'
-    parsed = JSON.parse(facts)
+    parsed = {}
+    facts.each_line do |l|
+      p = JSON.parse(l)
+      parsed.update(p) if p
+    end
     return parsed[servicename]
   end
 end