From df10e6c4f8a04ed441f992a52d699e8b2c2c56d1 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 3 Dec 2012 07:57:33 +0000 Subject: [PATCH] update sources.lists for wheezy Signed-off-by: Stephen Gran --- modules/debian-org/manifests/init.pp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 04db264f..d5d973d3 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -83,15 +83,13 @@ class debian-org { require => Package['molly-guard'], } - # This really means 'not wheezy' - - if $::debarchitecture != 'armhf' { - site::aptrepo { 'security': - url => 'http://security.debian.org/', - suite => "${::lsbdistcodename}/updates", - components => ['main','contrib','non-free'] - } + site::aptrepo { 'security': + url => 'http://security.debian.org/', + suite => "${::lsbdistcodename}/updates", + components => ['main','contrib','non-free'] + } + if $::lsbdistcodename != 'wheezy' { site::aptrepo { 'backports.debian.org': url => 'http://backports.debian.org/debian-backports/', suite => "${::lsbdistcodename}-backports", @@ -132,7 +130,7 @@ class debian-org { if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') { site::aptrepo { 'debian': url => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), - suite => "${::lsbdistcodename}", + suite => $::lsbdistcodename, components => ['main','contrib','non-free'] } } -- 2.39.2