Merge branch 'develop'

2 files changed, 11 insertions, 0 deletions

diff --git a/puppet/modules/rubygems b/puppet/modules/rubygems
deleted file mode 160000
-Subproject e704c9fe1c40fea5b10fe3ca2b4f5de825341cc
diff --git a/puppet/modules/rubygems/manifests/postgres.pp b/puppet/modules/rubygems/manifests/postgres.pp
new file mode 100644
index 00000000..8720f4ef
--- /dev/null
+++ b/puppet/modules/rubygems/manifests/postgres.pp
@@ -0,0 +1,11 @@
+class rubygems::postgres {
+  if $::osfamily == 'RedHat' and
+    versioncmp($::operatingsystemrelease,'5') > 0 {
+    package{'rubygem-pg':
+      ensure => installed,
+    }
+  } else {
+    require postgres::devel
+    rubygems::gem{'ruby-pg':}
+  }
+}