update zumbi email address

[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 55cb506..ad53e5c 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -35,7 +35,7 @@ class debian-org {
                'weasel@debian.org',
                'steve@lobefin.net',
                'paravoid@debian.org',
-               'zumbi@kos.to'
+               'zumbi@oron.es'
        ]
 
        package { [
@@ -131,10 +131,16 @@ class debian-org {
                content => "",
        }
 
-       site::aptrepo { 'security':
-               url        => 'http://security-cdn.debian.org/',
-               suite      => "${mungedcodename}/updates",
-               components => ['main','contrib','non-free']
+       if ($::lsbmajdistrelease >= 8) {
+               site::aptrepo { 'security':
+                       url        => 'http://security-cdn.debian.org/',
+                       suite      => "${mungedcodename}/updates",
+                       components => ['main','contrib','non-free']
+               }
+       } else {
+               site::aptrepo { 'security':
+                       ensure => absent,
+               }
        }
        site::aptrepo { 'debian-lts':
                ensure => absent,
@@ -197,6 +203,15 @@ class debian-org {
                        components => ['main','contrib','non-free']
                }
        }
+       site::aptrepo { 'debian-cdn':
+               ensure => absent,
+       }
+
+       site::aptrepo { 'debian2':
+               url        => "http://cdn-fastly.deb.debian.org/debian",
+               suite      => $mungedcodename,
+               components => ['main','contrib','non-free']
+       }
 
        file { '/etc/facter':
                ensure  => directory,