fix munin 1

[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 e013701..74aaa71 100644 (file)
--- a/modules/debian-org/manifests/apt.pp
+++ b/modules/debian-org/manifests/apt.pp
@@ -18,9 +18,9 @@ class debian-org::apt {
        }
 
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-               $mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror ]
+               $mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror, 'http://debian.anycast-test.mirrors.debian.org/debian/' ]
        } else {
-               $mirror = [ $fallbackmirror ]
+               $mirror = [ $fallbackmirror, 'http://debian.anycast-test.mirrors.debian.org/debian/' ]
        }
 
        site::aptrepo { 'debian':
@@ -29,13 +29,19 @@ class debian-org::apt {
                components => ['main','contrib','non-free']
        }
        site::aptrepo { 'security':
-               url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
+               url        => [ 'http://security-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ],
                suite      => "${mungedcodename}/updates",
                components => ['main','contrib','non-free']
        }
+
+       if has_role('experimental_apache') {
+               $dbdosuites = [ 'debian-all', $::lsbdistcodename, 'jessie-apache2' ]
+       } else {
+               $dbdosuites = [ 'debian-all', $::lsbdistcodename ]
+       }
        site::aptrepo { 'db.debian.org':
                url        => 'http://db.debian.org/debian-admin',
-               suite      => [ 'debian-all', $::lsbdistcodename ],
+               suite      => $dbdosuites,
                components => 'main',
                key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
        }