From 1b3455a697ae74b34f28f4960bf0a274e27a1ee8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 27 Jan 2015 22:40:08 +0100
Subject: provide way to customize all three apt sources urls (basic, security,
 backports)

Change-Id: I5542b320bb1edb52c63350b5e4fd2af681991fb5
---
 provider_base/common.json                 |  6 +++++-
 provider_base/provider.json               |  6 +++++-
 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
-- 
cgit v1.2.3