diff options
author | varac <varacanero@zeromail.org> | 2015-01-27 23:42:18 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-01-27 23:42:18 +0100 |
commit | c83b1bb71bb818d361bf7bae62ca3dd71f044efd (patch) | |
tree | bcca951073dbe7e6f2eabd69d7c8223ce0ec619b /puppet | |
parent | 74b420220315b9b0731a6ebb22ce3f4a837cf052 (diff) | |
parent | 1b3455a697ae74b34f28f4960bf0a274e27a1ee8 (diff) |
Merge branch '6674_custom_apt_sources' into develop
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 633ccf1e..506591dc 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,7 +1,16 @@ 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'] + class { 'apt': - custom_key_dir => 'puppet:///modules/site_apt/keys' + custom_key_dir => 'puppet:///modules/site_apt/keys', + debian_url => $apt_url_basic, + security_url => $apt_url_security, + backports_url => $apt_url_backports } # enable http://deb.leap.se debian package repository |