diff options
| author | varac <varacanero@zeromail.org> | 2015-01-27 22:40:08 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-01-27 22:43:36 +0100 |
| commit | 1b3455a697ae74b34f28f4960bf0a274e27a1ee8 (patch) | |
| tree | 48a58caf1a493232a429fa33a4a42ebc79f64d74 | |
| parent | e99752e09a784629b89a2f798109804b11a1e8a4 (diff) | |
provide way to customize all three apt sources urls (basic, security, backports)
Change-Id: I5542b320bb1edb52c63350b5e4fd2af681991fb5
| -rw-r--r-- | provider_base/common.json | 6 | ||||
| -rw-r--r-- | provider_base/provider.json | 6 | ||||
| -rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 12 |
3 files changed, 18 insertions, 6 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index c25f59b4..cc4d2557 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -52,6 +52,10 @@ "major_version": "= Leap::Platform.major_version" }, "apt": { - "url": "= provider.apt.url" + "url": { + "basic": "= provider.apt.url.basic", + "security": "= provider.apt.url.security", + "backports": "= provider.apt.url.backports" + } } } diff --git a/provider_base/provider.json b/provider_base/provider.json index d66a01c4..84d033c5 100644 --- a/provider_base/provider.json +++ b/provider_base/provider.json @@ -61,6 +61,10 @@ "max": null }, "apt": { - "url": "http://http.debian.net/debian/" + "url": { + "basic": "http://http.debian.net/debian/", + "security": "http://security.debian.org/", + "backports": "http://http.debian.net/debian/" + } } } diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 7e63eaf1..506591dc 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,12 +1,16 @@ class site_apt { - $apt_config = hiera('apt') - $apt_url = $apt_config['url'] + $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', - debian_url => $apt_url, - backports_url => $apt_url + debian_url => $apt_url_basic, + security_url => $apt_url_security, + backports_url => $apt_url_backports } # enable http://deb.leap.se debian package repository |