store augeas lenses independently of augeas installation

modules/augeas/manifests/init.pp

@@ -1,5 +1,10 @@
 class augeas {
-	package { 'augeas-libs':
-		ensure => latest,
+	$lens_dir = '/var/lib/augeas'
+
+	file { "${lens_dir}":
+		ensure => directory,
+		owner => root,
+		group => root,
+		mode => 0755,
 	}
 }

modules/augeas/manifests/lens.pp

@@ -1,10 +1,12 @@
 define augeas::lens($source) {
-	file { "/usr/share/augeas/lenses/${name}.aug":
+	include augeas
+
+	file { "${augeas::lens_dir}/${name}.aug":
 		ensure => present,
 		source => "${source}",
 		owner => root,
 		group => root,
 		mode => 0644,
-		require => Package['augeas-libs'],
+		require => File["${augeas::lens_dir}"],
 	}
 }

modules/wordpress/manifests/config_param.pp

@@ -1,11 +1,13 @@
 define wordpress::config_param($wp_root, $key, $value) {
+	include augeas
 	include internal::lens
 
 	# first try to see if there is a double quoted param of the specified name
 	# and if it is then replace it with a single quoted version and set it to the desired value
 	augeas { "wp_replace_double_quoted_config_param-${wp_root}-${key}":
 		incl => "${wp_root}/wp-config.php",
 		lens => 'Wordpress.lns',
+		load_path => "${augeas::lens_dir}"
 		context => "/files${wp_root}/wp-config.php",
 		onlyif => "match \"\\\"${key}\\\"\" != []",
 		changes => [
@@ -20,6 +22,7 @@
 	augeas { "wp_insert_new_config_param-${wp_root}-${key}":
 		incl => "${wp_root}/wp-config.php",
 		lens => 'Wordpress.lns',
+		load_path => "${augeas::lens_dir}"
 		context => "/files${wp_root}/wp-config.php",
 		onlyif => "match \"'${key}'\" == []",
 		changes => [
@@ -33,6 +36,7 @@
 	augeas { "wp_set_config_param-${wp_root}-${key}":
 		incl => "${wp_root}/wp-config.php",
 		lens => 'Wordpress.lns',
+		load_path => "${augeas::lens_dir}"
 		context => "/files${wp_root}/wp-config.php",
 		changes => [
 			"set \"'${key}'\" \"'${value}'\"",

modules/wordpress/manifests/internal/prerequisites.pp

@@ -2,7 +2,6 @@
 	include php5::apache_module
 	include php5::mysql
 	include mysql::server
-	include augeas
 
 	package { ['curl', 'tar']:
 		ensure => present,