X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Frepo%2Fapt.pp;h=0902e2c28e713ae14faeaf9cc68f0f67a5daa7cc;hb=24caa46729f80fbba4be8b9b26ebcb3acc4cb0fb;hp=651e4e377850441cedc0ec03020bbe58d4dcd61b;hpb=921e69100a563cf143f56a3905d8362336d939ff;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/manifests/repo/apt.pp b/3rdparty/modules/rabbitmq/manifests/repo/apt.pp
index 651e4e377..0902e2c28 100644
--- a/3rdparty/modules/rabbitmq/manifests/repo/apt.pp
+++ b/3rdparty/modules/rabbitmq/manifests/repo/apt.pp
@@ -2,40 +2,40 @@
 #   puppetlabs-apt
 #   puppetlabs-stdlib
 class rabbitmq::repo::apt(
-  String $location               = 'https://packagecloud.io/rabbitmq/rabbitmq-server',
-  String $repos                  = 'main',
-  Boolean $include_src           = false,
-  String $key                    = '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
-  String $key_source             = $rabbitmq::package_gpg_key,
-  Optional[String] $key_content  = $rabbitmq::key_content,
-  Optional[String] $architecture = undef,
+  $location    = 'http://www.rabbitmq.com/debian/',
+  $release     = 'testing',
+  $repos       = 'main',
+  $include_src = false,
+  $key         = 'F78372A06FF50C80464FC1B4F7B8CEA6056E8E56',
+  $key_source  = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc',
+  $key_content = undef,
   ) {
 
   $pin = $rabbitmq::package_apt_pin
 
-  # ordering / ensure to get the last version of repository
-  Class['rabbitmq::repo::apt']
-  -> Class['apt::update']
+  Class['rabbitmq::repo::apt'] -> Package<| title == 'rabbitmq-server' |>
+
+  $ensure_source = $rabbitmq::repos_ensure ? {
+    false   => 'absent',
+    default => 'present',
+  }
 
-  $osname = downcase($facts['os']['name'])
   apt::source { 'rabbitmq':
-    ensure       => present,
-    location     => "${location}/${osname}",
-    repos        => $repos,
-    include      => { 'src' => $include_src },
-    key          => {
-      'id'      => $key,
-      'source'  => $key_source,
-      'content' =>  $key_content,
-    },
-    architecture => $architecture,
+    ensure      => $ensure_source,
+    location    => $location,
+    release     => $release,
+    repos       => $repos,
+    include_src => $include_src,
+    key         => $key,
+    key_source  => $key_source,
+    key_content => $key_content,
   }
 
-  if $pin {
+  if $pin != '' {
+    validate_re($pin, '\d\d\d')
     apt::pin { 'rabbitmq':
-      packages => '*',
+      packages => 'rabbitmq-server',
       priority => $pin,
-      origin   => 'packagecloud.io',
     }
   }
 }