More kfreebsd removal

[mirror/dsa-puppet.git] / modules / debian_org / manifests / apt.pp

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 3fc0979..90ac4fb 100644 (file)
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -3,14 +3,6 @@
 # Stuff common to all debian.org servers
 #
 class debian_org::apt {
-       if versioncmp($::lsbmajdistrelease, '7') <= 0 {
-               $mungedcodename = $::lsbdistcodename
-       } elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-               $mungedcodename = "${::lsbdistcodename}-kfreebsd"
-       } else {
-               $mungedcodename = $::lsbdistcodename
-       }
-
        if versioncmp($::lsbmajdistrelease, '8') <= 0 {
                $fallbackmirror = 'http://cdn-fastly.deb.debian.org/debian/'
        } else {
@@ -25,7 +17,7 @@ class debian_org::apt {
 
        site::aptrepo { 'debian':
                url        => $mirror,
-               suite      => [ $mungedcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
+               suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
                components => ['main','contrib','non-free']
        }
 
@@ -36,7 +28,7 @@ class debian_org::apt {
        } else {
                site::aptrepo { 'security':
                        url        => [ 'http://security-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ],
-                       suite      => "${mungedcodename}/updates",
+                       suite      => "${::lsbdistcodename}/updates",
                        components => ['main','contrib','non-free']
                }
        }
@@ -49,10 +41,10 @@ class debian_org::apt {
                key        => 'puppet:///modules/debian_org/db.debian.org.gpg',
        }
 
-       if ($::hostname in [] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+       if ($::hostname in []) {
                site::aptrepo { 'proposed-updates':
                        url        => $mirror,
-                       suite      => "${mungedcodename}-proposed-updates",
+                       suite      => "${::lsbdistcodename}-proposed-updates",
                        components => ['main','contrib','non-free']
                }
        } else {