diff options
author | elijah <elijah@riseup.net> | 2015-02-04 14:03:31 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-02-04 14:03:31 -0800 |
commit | aed223ad42635370bdbc1b239ed43a1330698c5e (patch) | |
tree | 852d5d4e7d3e24eb8dd064435edf2a8c94feb0f3 /puppet/modules/soledad/manifests/server.pp | |
parent | b76790c6b1a50406b8b576014614d000dc23b6ea (diff) |
consolidate sources into common.json
Diffstat (limited to 'puppet/modules/soledad/manifests/server.pp')
-rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp index 394e6032..b71fab69 100644 --- a/puppet/modules/soledad/manifests/server.pp +++ b/puppet/modules/soledad/manifests/server.pp @@ -12,6 +12,8 @@ class soledad::server { $soledad_port = $soledad['port'] + $sources = hiera('sources') + include site_config::x509::cert include site_config::x509::key include site_config::x509::ca @@ -29,8 +31,8 @@ class soledad::server { require => Class['soledad']; } - package { 'soledad-server': - ensure => latest, + package { $sources['soledad']['package']: + ensure => $sources['soledad']['revision'], require => [ Class['site_apt::preferences::twisted'], Class['site_apt::leap_repo'] ]; |