# This is a combination of 2 commits.

# The first commit's message is: PUP-437 fix Puppet 4 compatibility # This is the 2nd commit message: PUP-437 add puppet_confdir fact
aharden · Oct 23, 2015 · 5fba4ec · 5fba4ec
1 parent abfad2d
commit 5fba4ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/facter/puppet_confdir.rb b/lib/facter/puppet_confdir.rb
@@ -0,0 +1,7 @@
+require 'puppet'
+
+Facter.add('puppet_confdir') do
+  setcode do
+    Puppet.settings['confdir']
+  end
+end
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -31,13 +31,7 @@
 # Sample Usage:
 #
 class puppet_ent_agent::params {
-  if $::osfamily == 'windows' {
-    $appdata = regsubst($::common_appdata,'\\','/','G')
-    $config = "${appdata}/PuppetLabs/puppet/etc/puppet.conf"
-  }
-  else {
-    $config = '/etc/puppetlabs/puppet/puppet.conf'
-  }
+  $config                  = "${::puppet_confdir}/puppet.conf"
   $ensure                  = 'present'
   $master                  = $::settings::server
   $agent_server            = undef