diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2012-10-16 16:37:01 +0200 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2012-10-16 17:13:33 +0200 |
| commit | 4f5191b7354fa4445d53a5dbd112086b35210519 (patch) | |
| tree | 5ac2a7cb9b36864256ced584534bf1a396fb7bd9 | |
| parent | 1afd076a152f43645c91b1e2bab15fda7498055c (diff) | |
Use standard lens dir for non-dist lenses
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | manifests/base.pp | 2 | ||||
| -rw-r--r-- | manifests/debian.pp | 2 | ||||
| -rw-r--r-- | manifests/lens.pp | 2 | ||||
| -rw-r--r-- | manifests/redhat.pp | 2 |
5 files changed, 4 insertions, 7 deletions
@@ -10,8 +10,5 @@ This module does 3 things: o provides a few lenses only included in recent augeas releases. - o creates /usr/share/augeas/lenses/contrib in which other modules can put - custom lenses (see puppet-mysql/puppet-haproxy for working examples). - o let's you force the version by defining $augeas_version, else puppet will only ensure the packages are present. 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}" } |