Merge pull request #1 from danbeaman/augeas-refactor

Refactor Augeas resource
cnwrinc · Jun 29, 2016 · 04a4f4c · 04a4f4c
2 parents b48e046 + 1d7b8d0
commit 04a4f4c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,6 +18,7 @@ group :test do
   gem "puppet-lint-version_comparison-check"
   gem "puppet-lint-classes_and_types_beginning_with_digits-check"
   gem "puppet-lint-unquoted_string-check"
+  gem "safe_yaml", '~> 1.0.4'
 end
 
 group :development do

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -15,10 +15,13 @@
   augeas { 'cacti_perms':
     incl    => '/etc/httpd/conf.d/cacti.conf',
     lens    => 'Httpd.lns',
-    context => '/files/etc/httpd/conf.d/cacti.conf',
-    changes => [ 'set /files/etc/httpd/conf.d/cacti.conf/Directory[1]/IfModule[1]/directive/arg[1] all',
-      'set /files/etc/httpd/conf.d/cacti.conf/Directory[1]/IfModule[1]/directive/arg[2] granted',
-      'set /files/etc/httpd/conf.d/cacti.conf/Directory[1]/IfModule[2]/directive[3]/arg[2] all',
+    changes => [
+      'defnode req Directory[arg="/usr/share/cacti/"]/IfModule[arg="mod_authz_core.c"]/directive[.="Require"] "Require"',
+      'set $req/arg[1] "all"',
+      'set $req/arg[2] "granted"',
+
+      'defnode nomodauthzcore Directory[arg="/usr/share/cacti/"]/IfModule[arg="!mod_authz_core.c"] ""',
+      'set $nomodauthzcore/directive[.="Allow"]/arg[2] "all"',
     ],
   }
 

diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -36,8 +36,7 @@
         it do
           is_expected.to contain_augeas('cacti_perms').
             with({"incl"=>"/etc/httpd/conf.d/cacti.conf",
-                  "lens"=>"Httpd.lns",
-                  "context"=>"/files/etc/httpd/conf.d/cacti.conf"})
+                  "lens"=>"Httpd.lns"})
         end
         it do
           is_expected.to contain_cron__job('cacti').