From 274cee2ad8af9aaee2c258ad112a9d3d4d30edcb Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 18 Apr 2012 15:53:04 +0300
Subject: [PATCH] Install rubygems for puppetmaster on CentOS 6

---
 mongrel/manifests/init.pp | 17 +++++++++++++++--
 puppet/manifests/init.pp  | 23 ++++++++++++-----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/mongrel/manifests/init.pp b/mongrel/manifests/init.pp
index ee6b2ff..275293f 100644
--- a/mongrel/manifests/init.pp
+++ b/mongrel/manifests/init.pp
@@ -3,14 +3,27 @@
 #
 class mongrel {
 
+    require ruby::rubygems
+
     package { "mongrel":
-        name   => $operatingsystem ? {
+        ensure   => installed,
+        name     => $operatingsystem ? {
             openbsd => "ruby-mongrel",
             debian  => "mongrel",
             ubuntu  => "mongrel",
+            centos  => $operatingsystemrelease ? {
+                /^[1-5]/ => "rubygem-mongrel",
+                default  => "mongrel",
+            },
             default => "rubygem-mongrel",
         },
-        ensure => installed,
+        provider => $operatingsystem ? {
+            centos  => $operatingsystemrelease ? {
+                /^[1-5]/ => undef,
+                default  => "gem",
+            },
+            default => undef,
+        },
     }
 
 }
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 8d988ee..5499659 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -218,6 +218,7 @@ class puppet::server::common inherits puppet::client {
     }
 
     if $puppet_storeconfigs != "none" {
+        require ruby::rubygems
         case $operatingsystem {
             "centos": {
                 if $operatingsystemrelease =~ /^[1-5]/ {
@@ -225,6 +226,15 @@ class puppet::server::common inherits puppet::client {
                                 "rubygem-sqlite3-ruby", ]:
                         ensure => installed,
                     }
+                } else {
+                    package { "rails":
+                        ensure   => "2.3.14",
+                        provider => "gem",
+                    }
+                    package { "sqlite3":
+                        ensure   => installed,
+                        provider => "gem",
+                    }
                 }
             }
             "debian","ubuntu": {
@@ -489,6 +499,7 @@ class puppet::server::mongrel {
     }
 
     include ldap::client::ruby
+    include ::mongrel
 
     service { "puppetmaster":
         ensure    => running,
@@ -496,17 +507,7 @@ class puppet::server::mongrel {
         hasstatus => true,
         subscribe => File["/etc/puppet/fileserver.conf",
                           "/etc/puppet/puppet.conf"],
-    }
-
-    if $operatingsystem == "CentOS" and $operatingsystemrelease !~ /^[1-5]/ {
-        Service["puppetmaster"] {
-            require => Package["puppetmaster"]
-        }
-    } else {
-        include ::mongrel
-        Service["puppetmaster"] {
-            require => Package["puppetmaster", "mongrel"]
-        }
+        require   => Package["puppetmaster", "mongrel"],
     }
 
     case $operatingsystem {