summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt
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/site_apt
parentb76790c6b1a50406b8b576014614d000dc23b6ea (diff)
consolidate sources into common.json
Diffstat (limited to 'puppet/modules/site_apt')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 506591dc..c32c29c4 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,10 +1,10 @@
class site_apt {
- $apt_config = hiera('apt')
- $apt_url = $apt_config['url']
- $apt_url_basic = $apt_url['basic']
- $apt_url_security = $apt_url['security']
- $apt_url_backports = $apt_url['backports']
+ $sources = hiera('sources')
+ $apt_config = $sources['apt']
+ $apt_url_basic = $apt_config['basic']
+ $apt_url_security = $apt_config['security']
+ $apt_url_backports = $apt_config['backports']
class { 'apt':
custom_key_dir => 'puppet:///modules/site_apt/keys',