update sources.lists for wheezy

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 04db264f5a5528a0fe26d7bc39b9a2ec64077d03..d5d973d372d095cfae130358326d22490a25af33 100644 (file)
--- 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']
                }
        }