log rsync for syncproxy and security to dedicated logs

[mirror/dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 10c8c4a..168b03f 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -6,7 +6,12 @@ class debian-org {
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
                $mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
        } else {
-               $mirror = 'http://ftp.debian.org/debian/'
+               #$mirror = 'http://ftp.debian.org/debian/'
+               if $::lsbmajdistrelease <= 8 {
+                       $mirror = 'http://cdn-fastly.deb.debian.org/debian/'
+               } else {
+                       $mirror = 'http://deb.debian.org/debian/'
+               }
        }
        if $::lsbmajdistrelease < 7 {
                $mirror_backports = 'http://backports.debian.org/debian-backports/'
@@ -162,7 +167,7 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       if ($::hostname in [mips-aql-05, mipsel-aql-01, mipsel-aql-02, mipsel-manda-02, eberlin, etler]) {
+       if ($::hostname in []) {
                site::aptrepo { 'proposed-updates':
                        url        => $mirror,
                        suite      => "${::lsbdistcodename}-proposed-updates",