From c401a47f78972143814bceba05f7aa615cfaf9b7 Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Tue, 21 Apr 2015 17:47:39 +0200
Subject: Initial support for Puppet 4 AIO package version

---
 manifests/init.pp   | 21 ++++++++++++++-------
 manifests/lens.pp   | 10 ++++++++--
 manifests/params.pp |  7 ++++++-
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 653925e..f927fe1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -14,12 +14,19 @@ class augeas (
   $purge        = true,
 ) inherits augeas::params {
 
-  anchor { 'augeas::begin': } ->
-  class {'::augeas::packages': } ->
-  class {'::augeas::files': } ->
-  anchor { 'augeas::end': }
+  if versioncmp($::puppetversion, '4.0.0') >= 0 {
+    anchor { 'augeas::begin': } ->
+    class {'::augeas::files': } ->
+    anchor { 'augeas::end': }
+  } else {
+    anchor { 'augeas::begin': } ->
+    class {'::augeas::packages': } ->
+    class {'::augeas::files': } ->
+    anchor { 'augeas::end': }
+
+    # lint:ignore:spaceship_operator_without_tag
+    Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |>
+    # lint:endignore
+  }
 
-  # lint:ignore:spaceship_operator_without_tag
-  Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |>
-  # lint:endignore
 }
diff --git a/manifests/lens.pp b/manifests/lens.pp
index c7dd6b2..8c5733b 100644
--- a/manifests/lens.pp
+++ b/manifests/lens.pp
@@ -60,8 +60,14 @@ define augeas::lens (
     mode => '0644',
   }
 
-  Exec {
-    path => $::path,
+  if versioncmp($::puppetversion, '4.0.0') >= 0 {
+    Exec {
+      path => "${::path}:/opt/puppetlabs/puppet/bin",
+    }
+  } else {
+    Exec {
+      path => $::path,
+    }
   }
 
   if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) {
diff --git a/manifests/params.pp b/manifests/params.pp
index 59023ab..4ca216d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,7 +3,12 @@
 # Default parameters for the Augeas module
 #
 class augeas::params {
-  $lens_dir = '/usr/share/augeas/lenses'
+
+  if versioncmp($::puppetversion, '4.0.0') >= 0 {
+    $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses'
+  } else {
+    $lens_dir = '/usr/share/augeas/lenses'
+  }
 
   case $::osfamily {
     'RedHat': {
-- 
cgit v1.2.3