Removed rails packages from puppet server if storeconfigs are not used.

This commit is contained in:
Timo Mkinen 2011-07-28 17:41:12 +03:00
parent 7e43368489
commit 11de076716

View file

@ -196,22 +196,33 @@ class puppet::server::mongrel inherits puppet::client {
include ::mongrel include ::mongrel
include ldap::client::ruby include ldap::client::ruby
if $puppet_storeconfigs != "none" {
case $operatingsystem { case $operatingsystem {
debian,ubuntu: { "debian","ubuntu": {
package { [ "rails", package { [ "rails",
regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'), regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'), ]:
regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'), ]:
ensure => installed, ensure => installed,
before => Service["puppetmaster"],
} }
} }
default: { default: {
package { [ "rubygem-rails", package { [ "rubygem-rails",
"rubygem-sqlite3-ruby", "rubygem-sqlite3-ruby", ]:
"ruby-RRDtool", ]:
ensure => installed, ensure => installed,
before => Service["puppetmaster"],
} }
} }
} }
}
package { "ruby-rrd":
name => $operatingsystem ? {
debian => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
ubuntu => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
default => "ruby-RRDtool",
},
ensure => installed,
}
if $puppet_datadir { if $puppet_datadir {
file { "${puppet_datadir}": file { "${puppet_datadir}":