diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2012-04-05 16:43:34 +0200 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2012-04-05 16:43:34 +0200 |
| commit | 613aaefb99961b714cb322754a647442790f90f0 (patch) | |
| tree | 6dc552fcb2c5872a88fdd28c0efb33962b65b1e6 /manifests | |
| parent | 96c7f29e6b0c445413ba1b2ede977b4a386bbf8f (diff) | |
| parent | ca238d239e166f68abc005ed4cd8e100cb3021d3 (diff) | |
Merge
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/debian.pp | 3 | ||||
| -rw-r--r-- | manifests/init.pp | 5 | ||||
| -rw-r--r-- | manifests/redhat.pp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index f31397b..78f74d7 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -5,6 +5,7 @@ class augeas::debian inherits augeas::base { ensure => "${augeas::base::version}", before => File['/usr/share/augeas/lenses/contrib'], } - package {'libaugeas-ruby1.8': ensure => present } + + package {'libaugeas-ruby1.8': ensure => "${augeas::rubylib_version}" } } diff --git a/manifests/init.pp b/manifests/init.pp index 545e012..85936e9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,5 +1,10 @@ class augeas { + $rubylib_version = $augeas_ruby_version ? { + '' => 'present', + default => $augeas_ruby_version + } + case $operatingsystem { /RedHat|CentOS|Fedora/: { include augeas::redhat } /Debian|Ubuntu|kFreeBSD/: { include augeas::debian } diff --git a/manifests/redhat.pp b/manifests/redhat.pp index 4d459f4..f70f43b 100644 --- a/manifests/redhat.pp +++ b/manifests/redhat.pp @@ -5,6 +5,6 @@ class augeas::redhat inherits augeas::base { ensure => "${augeas::base::version}", before => File['/usr/share/augeas/lenses/contrib'], } - package { 'ruby-augeas': ensure => present } + package { 'ruby-augeas': ensure => "${augeas::rubylib_version}" } } |