diff options
author | Josh Cooper <josh+github@puppetlabs.com> | 2012-03-06 17:14:35 -0800 |
---|---|---|
committer | Josh Cooper <josh+github@puppetlabs.com> | 2012-03-06 17:14:35 -0800 |
commit | 63834354c2c2ed56a01c8ff3d898c62d53551de1 (patch) | |
tree | 2b835293d04bde1be382a0a92f8b6fda763804dd /lib/facter/facter_dot_d.rb | |
parent | 32bad79d88e4464cb91101e4671874c11f3e5bf2 (diff) | |
parent | 369f7304310f8cff7d3c0cb81932aa8be1488ac2 (diff) |
Merge pull request #44 from jeffmccune/ticket/2.3.x/12357_add_puppet_settings_facts
(#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d
Diffstat (limited to 'lib/facter/facter_dot_d.rb')
-rw-r--r-- | lib/facter/facter_dot_d.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/facter/facter_dot_d.rb b/lib/facter/facter_dot_d.rb index b94aacd..8543c7c 100644 --- a/lib/facter/facter_dot_d.rb +++ b/lib/facter/facter_dot_d.rb @@ -11,6 +11,9 @@ # The cache is stored in /tmp/facts_cache.yaml as a mode # 600 file and will have the end result of not calling your # fact scripts more often than is needed + +require 'facter/util/puppet_settings' + class Facter::Util::DotD require 'yaml' @@ -182,3 +185,10 @@ end Facter::Util::DotD.new("/etc/facter/facts.d").create Facter::Util::DotD.new("/etc/puppetlabs/facter/facts.d").create + +# Windows has a different configuration directory that defaults to a vendor +# specific sub directory of the %COMMON_APPDATA% directory. +if Dir.const_defined? 'COMMON_APPDATA' then + windows_facts_dot_d = File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'facter', 'facts.d') + Facter::Util::DotD.new(windows_facts_dot_d).create +end |