Merge pull request #5 from lpalgarvio/patch-2

Patch 2
Zetten · Oct 13, 2015 · 851fbd8 · 851fbd8
2 parents 9f05c76 + 309774f
commit 851fbd8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/enc b/enc
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #
 # Copyright 2014 Peter van Zetten
 #
@@ -24,7 +24,7 @@ scope = { 'clientcert' => ARGV[0], 'fqdn' => ARGV[0], 'hostname' => ARGV[0] }
 # Hiera interface
 hiera = Hiera.new(:config => '/etc/puppet/hiera-enc/hiera-enc.yaml')
 
-lookupValues = ['environment', 'parameters', 'classes']
+lookup_values = ['environment', 'parameters', 'classes']
 
 result = {}
 

diff --git a/hiera-enc.yaml b/hiera-enc.yaml
@@ -4,5 +4,7 @@
 :yaml:
   :datadir: /etc/puppet/hiera-enc/nodes
 :hierarchy:
+  - "%{clientcert}"
   - "%{fqdn}"
+  - "%{hostname}"
   - "default"