aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-08-17 22:04:10 +0000
committerMichael Scherer <misc@mageia.org>2011-08-17 22:04:10 +0000
commit72df72da15c6a4a13fbd352bc1328660f998ec36 (patch)
treebfe2518254089b7ff43667bf281d6c7e294f5e21 /modules
parent8dfab26e68a24748f2f8970cec70a87ffb5f87be (diff)
downloadpuppet-72df72da15c6a4a13fbd352bc1328660f998ec36.tar
puppet-72df72da15c6a4a13fbd352bc1328660f998ec36.tar.gz
puppet-72df72da15c6a4a13fbd352bc1328660f998ec36.tar.bz2
puppet-72df72da15c6a4a13fbd352bc1328660f998ec36.tar.xz
puppet-72df72da15c6a4a13fbd352bc1328660f998ec36.zip
adapt the configuration for upgrade to mageia ( rails changed name )
Diffstat (limited to 'modules')
-rw-r--r--modules/puppet/manifests/init.pp9
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp
index 4fc38211..d7ccc6b7 100644
--- a/modules/puppet/manifests/init.pp
+++ b/modules/puppet/manifests/init.pp
@@ -34,9 +34,14 @@ class puppet {
}
# for stored config
- package { ["ruby-sqlite3","rails"]:
+ $rails_package = $lsbdistid ? {
+ Mageia => "ruby-rails",
+ MandrivaLinux => "rails"
+ }
+
+ package { ["ruby-sqlite3",$rails_package]:
ensure => installed
- }
+ }
service { puppetmaster:
ensure => running,