summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--provider_base/common.json7
-rw-r--r--provider_base/provider.json7
-rw-r--r--puppet/modules/site_apt/manifests/init.pp11
3 files changed, 24 insertions, 1 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 649db0d9..cc4d2557 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -50,5 +50,12 @@
"platform": {
"version": "= Leap::Platform.version.to_s",
"major_version": "= Leap::Platform.major_version"
+ },
+ "apt": {
+ "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 77437935..84d033c5 100644
--- a/provider_base/provider.json
+++ b/provider_base/provider.json
@@ -59,5 +59,12 @@
"client_version": {
"min": "0.5",
"max": null
+ },
+ "apt": {
+ "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 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