puppet: Move ruby-augeas package to ruby module, clean obsolete dependencies

This commit is contained in:
Ossi Salmi 2014-11-12 15:31:12 +02:00
parent 1664ecba80
commit 00572cc15e
2 changed files with 33 additions and 37 deletions

View file

@ -30,43 +30,7 @@ class puppet::client {
default: { $vardir = "/var/lib/puppet" }
}
case $::operatingsystem {
"centos","redhat","fedora": {
package { "ruby-shadow":
ensure => installed,
}
}
"debian": {
package { "libaugeas-ruby":
ensure => installed,
name => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
before => Service["puppet"],
}
}
"ubuntu": {
if versioncmp($::operatingsystemrelease, "13.10") < 0 {
$augeas_package = "libaugeas-ruby"
} else {
$augeas_package = "ruby-augeas"
}
package { $augeas_package:
ensure => installed,
before => Service["puppet"],
}
}
"openbsd": {
if $::operatingsystemrelease == "4.9" {
file { "/etc/rc.d/puppetd":
ensure => present,
source => "puppet:///modules/puppet/puppetd.rc",
mode => "0755",
owner => "root",
group => "wheel",
before => Service["puppet"],
}
}
}
}
require ruby::augeas
file { "/etc/puppet/puppet.conf":
ensure => present,