summaryrefslogtreecommitdiff
path: root/puppet/modules/leap_mx
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-02-04 14:03:31 -0800
committerelijah <elijah@riseup.net>2015-02-04 14:03:31 -0800
commitaed223ad42635370bdbc1b239ed43a1330698c5e (patch)
tree852d5d4e7d3e24eb8dd064435edf2a8c94feb0f3 /puppet/modules/leap_mx
parentb76790c6b1a50406b8b576014614d000dc23b6ea (diff)
consolidate sources into common.json
Diffstat (limited to 'puppet/modules/leap_mx')
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp15
1 files changed, 9 insertions, 6 deletions
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;
}