Merge branch 'develop'

2 files changed, 35 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/gpgme.pp b/puppet/modules/rubygems/manifests/gpgme.pp
new file mode 100644
index 00000000..e9b04a9a
--- /dev/null
+++ b/puppet/modules/rubygems/manifests/gpgme.pp
@@ -0,0 +1,35 @@
+class rubygems::gpgme{
+  case $::operatingsystem {
+    debian,ubuntu: {
+      case $::lsbdistcodename {
+        'lenny','squeeze': {
+          # install gpgme as gem, as the squeeze deb-package is too old
+          # for i.e. gpg module
+          $provider    = 'gem'
+          $packagename = 'ruby-gpgme'
+          }
+        default:  {
+          # don't need to install gpgme as gem, debian package works
+          # fine with the gpg module
+          $provider    = 'apt'
+          $packagename = 'libgpgme-ruby'
+        }
+      }
+    }
+    default: {
+      $provider = 'gem'
+      $packagename = 'ruby-gpgme'
+    }
+  }
+
+  if $provider == 'gem' {
+    require rubygems::devel
+    require gpg::gpgme::devel
+  }
+
+  package{'ruby-gpgme':
+    ensure   => present,
+    provider => $provider,
+    name     => $packagename
+  }
+}