update hiera.yaml search path and datadir defaults to current standards

voxpupuli · Feb 7, 2024 · 6d80e2c · 6d80e2c
1 parent ce505ae
commit 6d80e2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Environment variables
 
 ### HIERA_YAML_PATH
 
-The location of the `hiera.yaml` file. Defaults to `/etc/puppetlabs/code/hiera.yaml`
+The location of the `hiera.yaml` file. Defaults to `/etc/puppetlabs/puppet/hiera.yaml`
 
 ### PUPPETDB_URL
 

diff --git a/lib/puppet-lint/plugins/check_ghostbuster_hiera_files.rb b/lib/puppet-lint/plugins/check_ghostbuster_hiera_files.rb
@@ -14,14 +14,14 @@ def load_data(path, content)
 
 PuppetLint.new_check(:ghostbuster_hiera_files) do
   def hiera
-    @hiera ||= [ENV.fetch('HIERA_YAML_PATH', nil), '/etc/puppetlabs/code/hiera.yaml'].filter_map do |hiera_file|
+    @hiera ||= [ENV.fetch('HIERA_YAML_PATH', nil), '/etc/puppetlabs/puppetlabs/hiera.yaml'].filter_map do |hiera_file|
       YAML.load_file(hiera_file) if hiera_file && File.exist?(hiera_file)
     end
     @hiera[0]
   end
 
   def default_datadir
-    hiera.dig('defaults', 'datadir') || 'hieradata'
+    hiera.dig('defaults', 'datadir') || 'data'
   end
 
   def path_in_datadirs?(path)