From 4f5191b7354fa4445d53a5dbd112086b35210519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Tue, 16 Oct 2012 16:37:01 +0200
Subject: Use standard lens dir for non-dist lenses

---
 manifests/base.pp   | 2 +-
 manifests/debian.pp | 2 +-
 manifests/lens.pp   | 2 +-
 manifests/redhat.pp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'manifests')

diff --git a/manifests/base.pp b/manifests/base.pp
index 85b8c12..c6b6cdd 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,5 +1,5 @@
 class augeas::base {
-  $lens_dir = '/usr/share/augeas/lenses/contrib'
+  $lens_dir = '/usr/share/augeas/lenses'
 
   $version = $augeas_version ? {
     ''      => 'present',
diff --git a/manifests/debian.pp b/manifests/debian.pp
index 76b215c..5b737d6 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -3,7 +3,7 @@ class augeas::debian inherits augeas::base {
   package {
     ['augeas-lenses', 'libaugeas0', 'augeas-tools']:
       ensure => "${augeas::base::version}",
-      before => File['/usr/share/augeas/lenses/contrib'],
+      before => File['/usr/share/augeas/lenses'],
   }
 
   package {'libaugeas-ruby1.8': ensure => "${augeas::base::rubylib_version}" }
diff --git a/manifests/lens.pp b/manifests/lens.pp
index 4a1009e..95f7370 100644
--- a/manifests/lens.pp
+++ b/manifests/lens.pp
@@ -45,7 +45,7 @@ define augeas::lens (
     file { $test_dest:
       ensure => $ensure,
       source => $test_source,
-      notify => Exec["Test lens ${name}"]
+      notify => Exec["Test lens ${name}"],
     }
 
     exec { "Test lens ${name}":
diff --git a/manifests/redhat.pp b/manifests/redhat.pp
index 8ef8521..e03b420 100644
--- a/manifests/redhat.pp
+++ b/manifests/redhat.pp
@@ -3,7 +3,7 @@ class augeas::redhat inherits augeas::base {
   package {
     ['augeas', 'augeas-libs']:
       ensure => "${augeas::base::version}",
-      before => File['/usr/share/augeas/lenses/contrib'],
+      before => File['/usr/share/augeas/lenses'],
   }
   package { 'ruby-augeas': ensure => "${augeas::base::rubylib_version}" }
 
-- 
cgit v1.2.3