Merge pull request #8 from roman-mueller/master

Initial support for puppetserver 2.0.0 paths
voxpupuli · Jul 9, 2015 · 2bb33f9 · 2bb33f9
2 parents 7eb89c7 + fbcdb16
commit 2bb33f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/files/lenses/trapperkeeper.aug b/files/lenses/trapperkeeper.aug
@@ -117,7 +117,7 @@ let rec entry = hash (entry|simple|array)
 let lns = (empty|comment)* . (entry . (empty|comment)*)*
 
 (* Variable: filter *)
-let filter = incl "/etc/puppetserver/conf.d/*"
+let filter = incl "/etc/puppetserver/conf.d/*" . incl "/etc/puppetlabs/puppetserver/conf.d/*"
            . Util.stdexcl
 
 let xfm = transform lns filter
diff --git a/manifests/config/puppetserver.pp b/manifests/config/puppetserver.pp
@@ -4,7 +4,11 @@
 ) {
   require ::puppetserver::augeas
 
-  $targetdir = '/etc/puppetserver/conf.d'
+  if versioncmp($::puppetversion, '4.0.0') >= 0 {
+    $targetdir = '/etc/puppetlabs/puppetserver/conf.d'
+  } else {
+    $targetdir = '/etc/puppetserver/conf.d'
+  }
   $target = "/files${targetdir}/${name}"
 
   case $ensure {