projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
onion classes updates from tor: support direct onion services also
[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
..
41e160d
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,10
@@
module Puppet::Parser::Functions
facts = IO.read(fn)
require 'json'
- parsed = JSON.parse(facts)
+ parsed = {}
+ facts.each_line do |l|
+ p.update(JSON.parse(l))
+ end
return parsed[servicename]
end
end