Merge branch 'develop'

2 files changed, 19 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/mail.pp b/puppet/modules/rubygems/manifests/mail.pp
new file mode 100644
index 00000000..b8b50bbe
--- /dev/null
+++ b/puppet/modules/rubygems/manifests/mail.pp
@@ -0,0 +1,19 @@
+# manage the mail rubygem
+class rubygems::mail {
+  if ($::osfamily == 'RedHat') and
+    versioncmp($::operatingsystemrelease,'6') > 0 {
+    package{'rubygem-mail':
+      ensure => present,
+    }
+  } else {
+    require rubygems::devel
+    package{'mail':
+      ensure   => present,
+      provider => gem,
+    }
+
+    if $::rubyversion == '1.8.6' {
+      require rubygems::tlsmail
+    }
+  }
+}