Merge pull request #35 from OpenVoxProject/add-freebsd-custom-facts-directory

bastelfreak · web-flow · commit 1d9ae116c735 · 2025-06-28T09:52:16.000+02:00
Add FreeBSD custom_facts directory
diff --git a/lib/facter/custom_facts/util/config.rb b/lib/facter/custom_facts/util/config.rb
@@ -44,7 +44,8 @@ def self.setup_default_ext_facts_dirs
                                                    else
                                                      [
                                                        '/etc/puppetlabs/facter/facts.d',
-                                                       '/etc/facter/facts.d/',
+                                                       '/etc/facter/facts.d',
+                                                       '/usr/local/etc/facter/facts.d',
                                                        '/opt/puppetlabs/facter/facts.d'
                                                      ]
                                                    end
diff --git a/spec/custom_facts/util/config_spec.rb b/spec/custom_facts/util/config_spec.rb
@@ -57,7 +57,8 @@
       expect(LegacyFacter::Util::Config.external_facts_dirs)
         .to eq [
           '/etc/puppetlabs/facter/facts.d',
-          '/etc/facter/facts.d/',
+          '/etc/facter/facts.d',
+          '/usr/local/etc/facter/facts.d',
           '/opt/puppetlabs/facter/facts.d'
         ]
     end

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ def self.setup_default_ext_facts_dirs`
`44`	`44`	`else`
`45`	`45`	`[`
`46`	`46`	`'/etc/puppetlabs/facter/facts.d',`
`47`		`- '/etc/facter/facts.d/',`
	`47`	`+ '/etc/facter/facts.d',`
	`48`	`+ '/usr/local/etc/facter/facts.d',`
`48`	`49`	`'/opt/puppetlabs/facter/facts.d'`
`49`	`50`	`]`
`50`	`51`	`end`