From aed223ad42635370bdbc1b239ed43a1330698c5e Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 4 Feb 2015 14:03:31 -0800
Subject: consolidate sources into common.json

---
 puppet/modules/leap_mx/manifests/init.pp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index c2cc96c6..d8a24821 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -7,10 +7,12 @@ class leap_mx {
   $couchdb_host     = 'localhost'
   $couchdb_port     = '4096'
 
+  $sources          = hiera('sources')
+
   include soledad::common
   include site_apt::preferences::twisted
   include leap_mx::syslog
-  
+
   #
   # USER AND GROUP
   #
@@ -45,11 +47,12 @@ class leap_mx {
   #
 
   package {
-    'leap-mx':
-      ensure  => latest,
-      require => Class['site_apt::preferences::twisted'];
-
-    [ 'leap-keymanager' ]:
+    $sources['leap-mx']['package']:
+      ensure  => $sources['leap-mx']['revision'],
+      require => [
+        Class['site_apt::preferences::twisted'],
+        Class['site_apt::leap_repo'] ];
+    'leap-keymanager':
       ensure => latest;
   }
 
-- 
cgit v1.2.3