X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Finstall.pp;fp=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Finstall.pp;h=f2df83aa048292063738bad8ac07883b7a0bf72f;hb=24caa46729f80fbba4be8b9b26ebcb3acc4cb0fb;hp=6c236e0fabec120116631c7b7510f6cae78078e9;hpb=c7e7bcc28cc5dc48a7e284a3c82f33df27d1f57d;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/manifests/install.pp b/3rdparty/modules/rabbitmq/manifests/install.pp
index 6c236e0fa..f2df83aa0 100644
--- a/3rdparty/modules/rabbitmq/manifests/install.pp
+++ b/3rdparty/modules/rabbitmq/manifests/install.pp
@@ -1,23 +1,23 @@
 # Class rabbitmq::install
-# Ensures that rabbitmq-server exists
+# Ensures the rabbitmq-server exists
 class rabbitmq::install {
 
   $package_ensure   = $rabbitmq::package_ensure
   $package_name     = $rabbitmq::package_name
-  $rabbitmq_group   = $rabbitmq::rabbitmq_group
+  $package_provider = $rabbitmq::package_provider
+  $package_source   = $rabbitmq::real_package_source
 
-  package { $package_name:
-    ensure => $package_ensure,
-    notify => Class['rabbitmq::service'],
+  package { 'rabbitmq-server':
+    ensure   => $package_ensure,
+    name     => $package_name,
+    provider => $package_provider,
+    notify   => Class['rabbitmq::service'],
   }
 
-  if $rabbitmq::environment_variables['MNESIA_BASE'] {
-    file { $rabbitmq::environment_variables['MNESIA_BASE']:
-      ensure  => 'directory',
-      owner   => 'root',
-      group   => $rabbitmq_group,
-      mode    => '0775',
-      require => Package[$package_name],
+  if $package_source {
+    Package['rabbitmq-server'] {
+      source  => $package_source,
     }
   }
+
 }