augeas: be rigorous about what file ends up in contrib + fixed typo

1 files changed, 13 insertions, 7 deletions

diff --git a/manifests/classes/augeas.pp b/manifests/classes/augeas.pp
index 41e3a48..c04c9d1 100644
--- a/manifests/classes/augeas.pp
+++ b/manifests/classes/augeas.pp
@@ -1,7 +1,7 @@
 class augeas {
 
   if ( ! $augeas_version ) {
-    $augeas_version = "present",
+    $augeas_version = "present"
   }
 
   case $operatingsystem {
@@ -13,12 +13,16 @@ class augeas {
 }
 
 class augeas::base {
-  file {"/usr/share/augeas/lenses/contrib":
-    ensure => directory,
-    require => $operatingsystem ? {
-      debian => Package["augeas-lenses"],
-      redhat => Package["augeas"],
-    },
+
+  # ensure no file not managed by puppet ends up in there.
+  file { "/usr/share/augeas/lenses/contrib":
+    ensure  => directory,
+    recurse => true,
+    purge   => true,
+    force   => true,
+    mode    => 0644,
+    owner   => "root",
+    group   => "root",
   }
 }
 
@@ -27,6 +31,7 @@ class augeas::redhat inherits augeas::base {
   package {
     ["augeas", "augeas-libs"]:
       ensure => $augeas_version,
+      before => File["/usr/share/augeas/lenses/contrib"],
   }
   package { "ruby-augeas": ensure => present }
 
@@ -37,6 +42,7 @@ class augeas::debian inherits augeas::base {
   package {
     ["augeas-lenses", "libaugeas0", "augeas-tools"]:
        ensure => $augeas_version,
+       before => File["/usr/share/augeas/lenses/contrib"],
   }
   package { "libaugeas-ruby1.8": ensure => present }